neo-cmp-cli 1.13.17 → 1.13.18

package/template/neo-web-form/src/components/batchAddTable__c/index.tsx

@@ -83,6 +83,14 @@ interface BatchAddTableState {
   entityTypeList: any[];
   submitting: boolean;
   modalVisible: boolean;
+  /** Excel 导入 loading 状态 */
+  importLoading: boolean;
+  /** 导入进度信息 */
+  importProgress: { current: number; total: number } | null;
+  /** 当前页码 */
+  currentPage: number;
+  /** 每页条数 */
+  pageSize: number;
 }
 
 let rowKeySeed = 0;
@@ -145,6 +153,10 @@ export default class BatchAddTable extends React.PureComponent<
       entityTypeList: [],
       submitting: false,
       modalVisible: false,
+      importLoading: false,
+      importProgress: null,
+      currentPage: 1,
+      pageSize: 100,
     };
     this.loadFieldList = this.loadFieldList.bind(this);
     this.getEntityTypeList = this.getEntityTypeList.bind(this);
@@ -279,9 +291,14 @@ export default class BatchAddTable extends React.PureComponent<
       message.warning('暂无可用字段');
       return;
     }
-    this.setState((prev) => ({
-      rows: [...prev.rows, emptyRowForFields(visible)],
-    }));
+    const { rows, pageSize } = this.state;
+    const newRows = [...rows, emptyRowForFields(visible)];
+    // 计算新增后的最后一页页码
+    const lastPage = Math.ceil(newRows.length / pageSize);
+    this.setState({
+      rows: newRows,
+      currentPage: lastPage,
+    });
   }
 
   handleCellChange(rowKey: string, apiKey: string, value: any) {
@@ -418,67 +435,125 @@ export default class BatchAddTable extends React.PureComponent<
     message.success('模板已下载');
   }
 
+  /**
+   * 分批处理导入数据，避免大数据量阻塞 UI
+   */
+  private async processImportData(
+    rowsAoA: any[][],
+    fields: FieldInfo[],
+    colMap: Record<string, number>,
+    entityTypeList: any[],
+    onProgress: (current: number, total: number) => void,
+  ): Promise<RowRecord[]> {
+    const newRows: RowRecord[] = [];
+    const total = rowsAoA.length - 1; // 排除表头
+    const batchSize = 100; // 每批处理 100 行
+
+    for (let r = 1; r < rowsAoA.length; r++) {
+      const line = rowsAoA[r];
+      if (!line || !line.some((c) => c !== '' && c != null)) continue;
+
+      const row: RowRecord = { _rowKey: nextRowKey() };
+      fields.forEach((f) => {
+        const idx = colMap[f.apiKey];
+        const raw = idx !== undefined ? line[idx] : undefined;
+        row[f.apiKey] = this.parseImportedCell(f, raw, entityTypeList);
+      });
+      newRows.push(row);
+
+      // 每处理 batchSize 行，让出主线程并更新进度
+      if (r % batchSize === 0) {
+        onProgress(r - 1, total);
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      }
+    }
+
+    onProgress(total, total);
+    return newRows;
+  }
+
   handleImportBeforeUpload(file: File) {
     const fields = this.getVisibleFields();
     if (!fields.length) {
       message.warning('暂无可用字段');
       return false;
     }
+
+    // 设置导入 loading 状态
+    this.setState({
+      importLoading: true,
+      importProgress: { current: 0, total: 0 },
+    });
+
     const reader = new FileReader();
-    reader.onload = (e) => {
+    reader.onload = async (e) => {
       try {
-        const data = new Uint8Array(e.target?.result as ArrayBuffer); // 将文件内容转换为 Uint8Array
-        const wb = XLSX.read(data, { type: 'array', cellDates: true }); // 读取 Excel 文件
-        const sheetName = wb.SheetNames[0]; // 获取工作表名称
+        const data = new Uint8Array(e.target?.result as ArrayBuffer);
+        const wb = XLSX.read(data, { type: 'array', cellDates: true });
+        const sheetName = wb.SheetNames[0];
         if (!sheetName) {
           message.error('Excel 中未找到工作表');
+          this.setState({ importLoading: false, importProgress: null });
           return;
         }
-        const sheet = wb.Sheets[sheetName]; // 获取工作表
-        const rowsAoA: any[][] = XLSX.utils.sheet_to_json(sheet, { // 将工作表转换为 JSON 数组
-          header: 1, // 使用第一行作为标题行
-          raw: true, // 保持原始数据格式
-          defval: '', // 默认值
-        }) as any[][]; // 将 JSON 数组转换为 any[][] 类型
+        const sheet = wb.Sheets[sheetName];
+        const rowsAoA: any[][] = XLSX.utils.sheet_to_json(sheet, {
+          header: 1,
+          raw: true,
+          defval: '',
+        }) as any[][];
         if (!rowsAoA.length) {
           message.error('Excel 内容为空');
+          this.setState({ importLoading: false, importProgress: null });
           return;
         }
         const headerRow = rowsAoA[0] || [];
-        const colMap = this.buildHeaderIndexMap(headerRow, fields); // 构建列索引映射
-        const missing = fields.filter((f) => colMap[f.apiKey] === undefined); // 过滤出未匹配的字段
+        const colMap = this.buildHeaderIndexMap(headerRow, fields);
+        const missing = fields.filter((f) => colMap[f.apiKey] === undefined);
         if (missing.length) {
           message.error(
             `表头无法匹配字段：${missing.map((m) => m.label).join('、')}`,
           );
+          this.setState({ importLoading: false, importProgress: null });
           return;
         }
         const { entityTypeList } = this.state;
-        const newRows: RowRecord[] = [];
-        for (let r = 1; r < rowsAoA.length; r++) {
-          const line = rowsAoA[r];
-          if (!line || !line.some((c) => c !== '' && c != null)) continue;
-          const row: RowRecord = { _rowKey: nextRowKey() };
-          fields.forEach((f) => {
-            const idx = colMap[f.apiKey];
-            const raw = idx !== undefined ? line[idx] : undefined;
-            row[f.apiKey] = this.parseImportedCell(f, raw, entityTypeList); // 解析导入的单元格值
-          });
-          newRows.push(row);
-        }
+
+        // 使用分批处理解析数据
+        const newRows = await this.processImportData(
+          rowsAoA,
+          fields,
+          colMap,
+          entityTypeList,
+          (current, total) => {
+            this.setState({ importProgress: { current, total } });
+          },
+        );
+
         if (!newRows.length) {
           message.warning('未解析到有效数据行');
+          this.setState({ importLoading: false, importProgress: null });
           return;
         }
+
         this.setState((prev) => ({
           rows: [...prev.rows, ...newRows],
+          importLoading: false,
+          importProgress: null,
+          // 导入完成后跳转到第一页，展示新导入的数据
+          currentPage: 1,
         }));
         message.success(`已导入 ${newRows.length} 行`);
       } catch (err) {
         console.error(err);
         message.error('解析 Excel 失败');
+        this.setState({ importLoading: false, importProgress: null });
       }
     };
+    reader.onerror = () => {
+      message.error('读取文件失败');
+      this.setState({ importLoading: false, importProgress: null });
+    };
     reader.readAsArrayBuffer(file);
     return false;
   }
@@ -556,7 +631,13 @@ export default class BatchAddTable extends React.PureComponent<
     const cloned = this.cloneRowRecord(record, fields);
     const newRows = [...this.state.rows];
     newRows.splice(idx + 1, 0, cloned);
-    this.setState({ rows: newRows });
+    // 计算复制行所在的页码
+    const { pageSize, currentPage } = this.state;
+    const copiedRowIndex = idx + 1;
+    const copiedRowPage = Math.floor(copiedRowIndex / pageSize) + 1;
+    // 如果复制的行不在当前页，跳转到复制的行所在页
+    const newPage = copiedRowPage !== currentPage ? copiedRowPage : currentPage;
+    this.setState({ rows: newRows, currentPage: newPage });
     message.success('已在本行下方复制一行');
   }
 
@@ -566,10 +647,22 @@ export default class BatchAddTable extends React.PureComponent<
     if (newRows.length === 0 && fields.length) {
       newRows.push(emptyRowForFields(fields));
     }
-    this.setState({ rows: newRows });
+    // 删除后重新计算当前页码，避免当前页超出范围
+    const { pageSize, currentPage } = this.state;
+    const totalPages = Math.ceil(newRows.length / pageSize) || 1;
+    const newCurrentPage = Math.min(currentPage, totalPages);
+    this.setState({ rows: newRows, currentPage: newCurrentPage });
     message.success('已删除该行');
   }
 
+  /** 分页变化处理 */
+  handlePageChange = (page: number, pageSize?: number) => {
+    this.setState({
+      currentPage: page,
+      ...(pageSize ? { pageSize } : {}),
+    } as BatchAddTableState);
+  };
+
   openModal() {
     this.setState({ modalVisible: true });
   }
@@ -819,7 +912,7 @@ export default class BatchAddTable extends React.PureComponent<
   }
 
   render() {
-    const { loading, error, rows, submitting, title } = this.state;
+    const { loading, error, rows, submitting, title, importLoading, importProgress, currentPage, pageSize } = this.state;
     const { tableTitle, className, data } = this.props;
     const curAmisData = data || {};
     const systemInfo = curAmisData.__NeoSystemInfo || {};
@@ -876,6 +969,11 @@ export default class BatchAddTable extends React.PureComponent<
       ),
     });
 
+    // 计算分页数据
+    const startIndex = (currentPage - 1) * pageSize;
+    const endIndex = startIndex + pageSize;
+    const paginatedRows = rows.slice(startIndex, endIndex);
+
     const displayTitle =
       tableTitle || title || '批量新增数据';
     const batchImportButtonTitle =
@@ -967,14 +1065,16 @@ export default class BatchAddTable extends React.PureComponent<
               accept=".xlsx,.xls"
               showUploadList={false}
               beforeUpload={this.handleImportBeforeUpload}
+              disabled={importLoading}
             >
               <Button
                 size="small"
                 className="batch-add-modal-toolbar-btn"
                 icon={<UploadOutlined />}
-                disabled={!xObjectApiKey || !fields.length}
+                loading={importLoading}
+                disabled={!xObjectApiKey || !fields.length || importLoading}
               >
-                Excel 导入
+                {importLoading ? '导入中...' : 'Excel 导入'}
               </Button>
             </Upload>
           </Space>
@@ -1008,15 +1108,35 @@ export default class BatchAddTable extends React.PureComponent<
               />
             ) : (
               <div className="table-wrap">
-                <Table
-                  rowKey="_rowKey"
-                  columns={columns as any}
-                  dataSource={rows}
-                  pagination={false}
-                  scroll={{ x: 'max-content' }}
-                  bordered
-                  size="small"
-                />
+                <Spin
+                  spinning={importLoading}
+                  tip={
+                    importProgress
+                      ? `正在加载导入数据... (${importProgress.current}/${importProgress.total})`
+                      : '正在加载导入数据...'
+                  }
+                  size="large"
+                >
+                  <Table
+                    rowKey="_rowKey"
+                    columns={columns as any}
+                    dataSource={paginatedRows}
+                    pagination={{
+                      current: currentPage,
+                      pageSize: pageSize,
+                      total: rows.length,
+                      showSizeChanger: true,
+                      showQuickJumper: true,
+                      pageSizeOptions: ['50', '100', '200', '500'],
+                      showTotal: (total) => `共 ${total} 条`,
+                      onChange: this.handlePageChange,
+                      onShowSizeChange: this.handlePageChange,
+                    }}
+                    scroll={{ x: 'max-content', y: 'calc(100vh - 400px)' }}
+                    bordered
+                    size="small"
+                  />
+                </Spin>
               </div>
             )}
           </Spin>

package/template/neo-web-form/src/components/batchAddTable__c/model.ts

@@ -21,7 +21,7 @@ export class BatchAddTableModel {
     batchImportButtonTitle: '批量导入',
     batchImportButtonAlign: 'right',
     xObjectDataApi: {
-      xObjectApiKey: 'opportunityProduct',
+      xObjectApiKey: 'opportunityProduct', // 商机明细
       fields: [],
     },
   };
@@ -31,7 +31,8 @@ export class BatchAddTableModel {
       apiKey: 'onSubmit',
       label: '点击提交',
       helpText: '点击提交按钮时触发，事件参数包含当前表格中所有行数据',
-      eventParams1:
+      /*
+      eventParams:
         [{ 
           "apiKey": "eventParam",
           "children":
@@ -42,6 +43,7 @@ export class BatchAddTableModel {
           "label": "事件入参",
           "type": "Object"
         }],
+        */
       eventParams:
         '[{"apiKey":"eventParam","children":[{"apiKey":"xObjectApiKey","label":"实体 API Key","type":"String"},{"apiKey":"rows","label":"表格数据列表","type":"Array"}],"label":"事件入参","type":"Object"}]',
     },

package/template/react-custom-cmp-template/package.json

@@ -45,7 +45,7 @@
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^18.0.0",
-    "neo-cmp-cli": "^1.13.17",
+    "neo-cmp-cli": "^1.13.18",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/template/asset-manage-template/src/utils/axiosFetcher.ts

@@ -1,37 +0,0 @@
-import axios from 'axios'; // https://www.axios-http.cn/docs/intro
-
-// 创建基于 axios 的 fetcher 函数
-const axiosFetcher = async (options: any) => {
-  try {
-    const config = {
-      ...options,
-      method: options?.method || 'GET',
-      data: options?.data || {},
-      headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-      },
-      timeout: options?.timeout || 30000,
-    };
-
-    if (config?.method === 'GET') {
-      config.params = options?.data || {};
-    }
-
-    const response = await axios(config);
-    return response?.data || {};
-  } catch (error) {
-    if (error.response) {
-      // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围
-      console.error('接口请求报错 / 接口服务异常：', error.message);
-    } else if (error.request) {
-      // 请求已经成功发起，但没有收到响应
-      console.error('接口请求报错 / 接口未正常响应：', error.message);
-    } else {
-      console.error('接口请求报错:', error, '，请求参数:', options);
-    }
-    throw error;
-  }
-};
-
-export default axiosFetcher;

package/template/asset-manage-template/src/utils/queryObjectData.ts

@@ -1,112 +0,0 @@
-import axiosFetcher from '$utils/axiosFetcher';
-
-/**
- * 这里存放通用查询类 Open API
- */
-
-/** 将 where 规范为 SQL 片段：字符串直接使用；数组用 and 拼接各条件 */
-function normalizeWhere(where: unknown): string {
-  if (where == null || where === '') {
-    return '';
-  }
-  if (typeof where === 'string') {
-    return where.trim();
-  }
-  if (Array.isArray(where)) {
-    return where
-      .map((part) => (part == null ? '' : String(part).trim()))
-      .filter(Boolean)
-      .join(' and ');
-  }
-  return '';
-}
-
-// 获取业务对象数据列表
-export const queryXObjectData = async (options?: any) => {
-  const apiUrl = '/rest/data/v2/query';
-  const curOptions = options || {};
-  const xObjectApiKey = curOptions.xObjectApiKey || '';
-  const fields = curOptions.fields || [];
-  const page = curOptions.page || 1;
-  const pageSize = curOptions.pageSize || 10;
-
-  // 自动添加 objectId 字段
-  if (!fields.includes('id')) {
-    fields.push('id');
-  }
-
-  // 计算分页偏移量
-  const offset = (page - 1) * pageSize;
-
-  // 构建 SQL 查询
-  let querySql = `select ${fields.join(',')} from ${xObjectApiKey}`;
-
-  // 添加排序条件（如果有的话）
-  if (curOptions.orderBy) {
-    querySql += ` order by ${curOptions.orderBy}`;
-  }
-
-  /**
-   * 添加过滤条件（如果有的话）
-   * 支持的操作符包括：=、!=、like、not like、not in、is not null、is null、>、<、<>、>=、<=、in、between ... and ...。
-   * 对于 =、like 和 in 有以下说明：
-   *   “=” 作为字符串的条件时，表示精确匹配。例如，查询条件 city = '北京'，将返回 city 字段值严格等于 "北京" 的所有记录。
-   *   "like" 作为字符串的条件时，需要使用"%" 通配符进行模糊匹配。例如，city like‘北京%'，将返回 city 字段值以 "北京" 开头的所有记录。
-   *         目前仅支持将通配符“%” 放到已知内容之后的查询方式，例如，不支持 city like ‘% 北京'的查询方式。
-   *         当 SQL 查询中包含“%”等特殊字符时，需要对 SQL 进行 URL 编码处理。
-   * 支持"in"，但不包括子查询。
-   * 支持的逻辑运算符包括：and、or。
-   *
-   * `where` 可为字符串，或字符串数组（多项默认以 and 连接，等价于手写 `a and b`）。
-   */
-  const whereClause = normalizeWhere(curOptions.where);
-  console.log('whereClause:', whereClause);
-  if (whereClause) {
-    querySql += ` where ${whereClause}`;
-  }
-
-  if (curOptions.page || curOptions.pageSize) {
-    // 添加分页限制
-    querySql += ` limit ${pageSize} offset ${offset}`;
-  }
-
-  try {
-    const config = {
-      url: apiUrl,
-      method: 'GET',
-      data: {
-        q: querySql,
-      },
-    };
-
-    const resultData = await axiosFetcher(config);
-
-    if (resultData.code === 200) {
-      const { records, totalSize } = resultData.result || {};
-      return {
-        status: true,
-        code: resultData.code,
-        msg: resultData.msg || '获取业务对象数据列表成功',
-        totalSize,
-        data: records || [],
-      };
-    }
-
-    return {
-      status: false,
-      code: resultData.code,
-      msg: resultData.msg || '获取业务对象数据列表失败',
-      data: [],
-    };
-  } catch (error) {
-    console.error('获取业务对象数据列表失败:', error);
-
-    return {
-      status: false,
-      msg: error.msg || error.message || '获取业务对象数据列表失败',
-      data: [],
-    };
-  }
-};
-
-export default queryXObjectData;

package/template/asset-manage-template/src/utils/xobjects.ts

@@ -1,162 +0,0 @@
-import { message } from 'antd';
-import axiosFetcher from './axiosFetcher';
-
-// 获取业务类型列表
-export const getEntityTypeList = async (
-  xObjectApiKey: string,
-  options?: any,
-) => {
-  const curOptions = options || {};
-  const apiUrl = `/rest/data/v2.0/xobjects/${xObjectApiKey}/busiType`;
-  try {
-    const config = {
-      ...curOptions,
-      url: apiUrl,
-      method: 'GET',
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('获取业务类型失败:', error);
-    message.error('获取业务类型失败。');
-    return {};
-  }
-};
-
-// 获取对象列表
-export const getEntityList = async (options?: any) => {
-  const curOptions = options || {};
-  const custom = curOptions.custom || false; // 默认获取标准对象列表
-  const active = curOptions.active || true; // 仅获取有权限的对象
-  const apiUrl = `/rest/metadata/v2.0/xobjects/filter?custom=${custom}&active=${active}`;
-  try {
-    const config = {
-      ...curOptions,
-      url: apiUrl,
-      method: 'GET',
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('获取对象列表失败:', error);
-    message.error('获取对象列表失败。');
-    return {};
-  }
-};
-
-// 创建业务数据
-export const createXObject = async (xObjectApiKey: string, options: any) => {
-  const curOptions = options || {};
-  const apiUrl = `/rest/data/v2.0/xobjects/${xObjectApiKey}`;
-  const formData = curOptions.data || {};
-  try {
-    const config = {
-      ...options,
-      url: apiUrl,
-      method: curOptions.method || 'GET',
-      data: {
-        data: formData,
-      },
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('创建业务数据失败:', error);
-    throw error;
-  }
-};
-
-// 获取业务对象描述
-export const getXObjectDesc = async (xObjectApiKey: string, options?: any) => {
-  const curOptions = options || {};
-  const apiUrl = `/rest/data/v2.0/xobjects/${xObjectApiKey}/description`;
-  try {
-    const config = {
-      ...options,
-      url: apiUrl,
-      method: curOptions.method || 'GET',
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('获取业务对象描述:', error);
-    throw error;
-  }
-};
-
-// 更新业务数据
-export const updateXObject = async (
-  xObjectApiKey: string,
-  objectId: string,
-  options: any,
-) => {
-  const curOptions = options || {};
-  const apiUrl = `/rest/data/v2.0/xobjects/${xObjectApiKey}/${objectId}`;
-  const formData = curOptions.data || {};
-  try {
-    const config = {
-      ...curOptions,
-      url: apiUrl,
-      method: curOptions.method || 'PATCH',
-      data: {
-        data: formData,
-      },
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('更新业务数据失败:', error);
-    throw error;
-  }
-};
-
-// 获取业务数据信息
-export const getXObject = async (
-  xObjectApiKey: string,
-  objectId: string,
-  options?: any,
-) => {
-  const curOptions = options || {};
-  const apiUrl = `/rest/data/v2.0/xobjects/${xObjectApiKey}/${objectId}`;
-  try {
-    const config = {
-      ...curOptions,
-      url: apiUrl,
-      method: curOptions.method || 'GET',
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('获取业务数据信息失败:', error);
-    throw error;
-  }
-};
-
-// 删除业务数据
-export const deleteXObject = async (
-  xObjectApiKey: string,
-  objectId: string,
-  options?: any,
-) => {
-  const curOptions = options || {};
-  const apiUrl = `/rest/data/v2.0/xobjects/${xObjectApiKey}/${objectId}`;
-  try {
-    const config = {
-      ...curOptions,
-      url: apiUrl,
-      method: curOptions.method || 'DELETE',
-    };
-
-    const result = await axiosFetcher(config);
-    return result;
-  } catch (error) {
-    console.error('删除业务数据:', error);
-    throw error;
-  }
-};