neo-cmp-cli 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo-cmp-cli",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "description": "前端脚手架：自定义组件开发工具，支持react 和 vue2.0技术栈。",
   "keywords": [
     "neo-cli",

package/src/module/main.js

@@ -110,9 +110,9 @@ module.exports = {
       curConfig.webpack.plugins &&
       Array.isArray(curConfig.webpack.plugins)
     ) {
-      curConfig.webpack.plugins.push(new AddNeoRequirePlugin({verbose: true}));
+      curConfig.webpack.plugins.push(new AddNeoRequirePlugin({ verbose: true }));
     } else {
-      curConfig.webpack.plugins = [new AddNeoRequirePlugin({verbose: true})];
+      curConfig.webpack.plugins = [new AddNeoRequirePlugin({ verbose: true })];
     }
 
     // 添加 内置 Neo 的 externals 配置
@@ -197,7 +197,10 @@ module.exports = {
         curCmpTypes = cmpTypes;
       } else {
         // 自动生成入口文件（并自动创建对应的注册文件）
-        const { widgetEntries, cmpTypes } = getEntriesWithAutoRegister(curConfig.componentsDir, cmpType);
+        const { widgetEntries, cmpTypes } = getEntriesWithAutoRegister(
+          curConfig.componentsDir,
+          cmpType
+        );
         entries = widgetEntries;
         curCmpTypes = cmpTypes;
       }
@@ -230,9 +233,9 @@ module.exports = {
       curConfig.webpack.plugins &&
       Array.isArray(curConfig.webpack.plugins)
     ) {
-      curConfig.webpack.plugins.push(new AddNeoRequirePlugin({verbose: true}));
+      curConfig.webpack.plugins.push(new AddNeoRequirePlugin({ verbose: true }));
     } else {
-      curConfig.webpack.plugins = [new AddNeoRequirePlugin({verbose: true})];
+      curConfig.webpack.plugins = [new AddNeoRequirePlugin({ verbose: true })];
     }
 
     // 添加 内置 Neo 的 externals 配置
@@ -251,7 +254,9 @@ module.exports = {
       Object.keys(curConfig.build2lib.entry).forEach((name) => {
         // 判断不是以Model结尾的文件
         if (!name.endsWith('Model')) {
-          curConfig.build2lib.entry[name] = [commonModulesFilePath].concat(curConfig.build2lib.entry[name]);
+          curConfig.build2lib.entry[name] = [commonModulesFilePath].concat(
+            curConfig.build2lib.entry[name]
+          );
         }
       });
     }

package/src/oss/publish2oss.js

@@ -1,6 +1,7 @@
 const { aliBOS, baiduBOS } = require('akfun');
 const fs = require('fs');
 const path = require('path');
+const _ = require('lodash');
 const { catchCurPackageJson } = require('../utils/pathUtils');
 const getConfigObj = require('../utils/getConfigObj');
 const updatePublishLog = require('../cmpUtils/updatePublishLog');
@@ -185,13 +186,25 @@ const getResultFilesByWidgetName = (files) => {
       return;
     }
     let widgetName = file.widgetName;
+    const curCmpInfo = {
+      'cmpType': _.kebabCase(widgetName),
+    }
+
     if (widgetName.includes('Model')) {
       widgetName = widgetName.replace('Model', '');
+      curCmpInfo.cmpType = _.kebabCase(widgetName),
+      curCmpInfo.modelAsset = !file.success ? `${file.error}[${file.ossPath}]` : file.ossPath;
+    } else if (file.fileName.endsWith('.css')) {
+      curCmpInfo.cssAsset = !file.success ? `${file.error}[${file.ossPath}]` : file.ossPath;
+    } else {
+      curCmpInfo.asset = !file.success ? `${file.error}[${file.ossPath}]` : file.ossPath;
     }
+
     if (widgetFilesMap[widgetName]) {
-      widgetFilesMap[widgetName].push(getResultFile(file));
+      widgetFilesMap[widgetName] = Object.assign(widgetFilesMap[widgetName], curCmpInfo);
     } else {
-      widgetFilesMap[widgetName] = [getResultFile(file)];
+      // widgetFilesMap[widgetName] = [getResultFile(file)];
+      widgetFilesMap[widgetName] = curCmpInfo;
     }
   });
 

package/src/plugins/AddNeoRequirePlugin.js

@@ -31,14 +31,14 @@ class AddNeoRequirePlugin {
         return true;
       }
     }
-    
+
     // 检查文件名模式
     for (const pattern of this.options.skipPatterns) {
       if (pattern.test(filename)) {
         return true;
       }
     }
-    
+
     return false;
   }
 
@@ -49,10 +49,12 @@ class AddNeoRequirePlugin {
     if (!content || typeof content !== 'string') {
       return false;
     }
-    
+
     // 检查是否包含注入的标识
-    return content.includes('NeoCustomCmpFileFactory(window.neoRequire)') && 
-           content.includes('if (!window.neoRequire)');
+    return (
+      content.includes('NeoCustomCmpFileFactory(window.neoRequire)') &&
+      content.includes('if (!window.neoRequire)')
+    );
   }
 
   /**
@@ -62,12 +64,12 @@ class AddNeoRequirePlugin {
     if (!content || typeof content !== 'string') {
       return false;
     }
-    
+
     // 检查文件是否为空或只包含空白字符
     if (content.trim().length === 0) {
       return false;
     }
-    
+
     return true;
   }
 
@@ -77,7 +79,7 @@ class AddNeoRequirePlugin {
   log(message, level = 'info') {
     if (this.options.verbose || level === 'error') {
       const prefix = `[AddNeoRequirePlugin]`;
-      console[level](`/n${prefix} ${message}`);
+      console[level](`${prefix} ${message}`);
     }
   }
 
@@ -90,7 +92,7 @@ class AddNeoRequirePlugin {
         },
         (assets) => {
           this.log('开始处理资源文件...');
-          
+
           let processedCount = 0;
           let skippedCount = 0;
           let errorCount = 0;
@@ -126,9 +128,8 @@ class AddNeoRequirePlugin {
               // 执行注入
               this.injectNeoRequire(compilation, filename, content);
               processedCount++;
-              
-              this.log(`成功处理文件: ${filename}`);
 
+              this.log(`成功处理文件: ${filename}`);
             } catch (error) {
               errorCount++;
               this.log(`处理文件失败: ${filename}, 错误: ${error.message}`, 'error');
@@ -137,8 +138,10 @@ class AddNeoRequirePlugin {
           }
 
           // 输出处理统计
-          this.log(`处理完成 - 成功: ${processedCount}, 跳过: ${skippedCount}, 错误: ${errorCount}`);
-          
+          this.log(
+            `处理完成 - 成功: ${processedCount}, 跳过: ${skippedCount}, 错误: ${errorCount}`
+          );
+
           if (errorCount > 0) {
             this.log(`警告: 有 ${errorCount} 个文件处理失败`, 'warn');
           }
@@ -164,7 +167,7 @@ class AddNeoRequirePlugin {
 
     // 创建新的资源
     const newSource = new ConcatSource(Header, content, Footer);
-    
+
     // 更新资源
     compilation.updateAsset(filename, newSource);
   }

package/src/template/antd-custom-cmp-template/package.json

@@ -47,7 +47,7 @@
     "@commitlint/config-conventional": "^9.1.1",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/develop/neo-custom-cmp-template/package.json

@@ -51,7 +51,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/echarts-custom-cmp-template/package.json

@@ -47,7 +47,7 @@
     "@commitlint/config-conventional": "^9.1.1",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",

package/src/template/neo-custom-cmp-template/neo.config.js

@@ -101,6 +101,7 @@ module.exports = {
   },
   publish2oss: {
     // 用于构建并发布至 OSS 的相关配置
+    cssExtract: true, // 不额外提取css文件
     /*
     【特别说明】以下配置项都自带默认值，非必填。如需自定义请自行配置。
     NODE_ENV: 'production',

package/src/template/neo-custom-cmp-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neo-custom-cmp-template",
-  "version": "1.1.1",
+  "version": "1.1.6",
   "description": "neo自定义组件模板（react&ts技术栈）",
   "keywords": [
     "自定义组件模板",
@@ -44,7 +44,7 @@
     "axios": "^0.27.2",
     "antd": "^4.9.4",
     "lodash": "^4.17.21",
-    "neo-open-api": "^1.0.8"
+    "neo-open-api": "^1.0.11"
   },
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",
@@ -52,7 +52,7 @@
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
     "@types/axios": "^0.14.0",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/neo-custom-cmp-template/src/components/entity-detail/index.tsx

@@ -28,6 +28,7 @@ interface EntityDetailProps {
   xObjectDetailApi?: {
     xObjectApiKey: string;
     objectId: string;
+    fieldDescList?: any[];
   };
   columnCount?: number;
   showTitle?: boolean;
@@ -85,7 +86,7 @@ export default class EntityDetail extends React.PureComponent<
     const { xObjectDetailApi } = this.props;
     if (!xObjectDetailApi?.xObjectApiKey || !xObjectDetailApi?.objectId) {
       this.setState({
-        error: '缺少必要参数：实体类型或数据ID',
+        error: '缺少必要参数：实体类型或业务数据ID',
         loading: false,
       });
       return;
@@ -95,9 +96,16 @@ export default class EntityDetail extends React.PureComponent<
   }
 
   async loadFieldDescriptions() {
-    const { xObjectDetailApi } = this.props;
-    if (!xObjectDetailApi?.xObjectApiKey) return;
+    const { xObjectDetailApi } = this.props || {};
+
+    // 方式一：直接从 props.xObjectDetailApi 中获取字段描述
+    if (xObjectDetailApi && xObjectDetailApi.fieldDescList) {
+      this.setState({ fieldDescriptions: xObjectDetailApi.fieldDescList });
+    }
 
+    /*
+    // 方式二：自行通过 OpenAPI SDK 获取字段描述
+    if (!xObjectDetailApi.xObjectApiKey) return;
     try {
       const result = await xObject.getDesc(xObjectDetailApi.xObjectApiKey);
       if (result?.status) {
@@ -107,6 +115,7 @@ export default class EntityDetail extends React.PureComponent<
     } catch (error: any) {
       console.error('获取字段描述失败:', error);
     }
+    */
   }
 
   async loadEntityDetail() {
@@ -116,10 +125,7 @@ export default class EntityDetail extends React.PureComponent<
     this.setState({ loading: true, error: null });
 
     try {
-      const result = await xObject.get(
-        xObjectDetailApi.xObjectApiKey,
-        xObjectDetailApi.objectId,
-      );
+      const result = await xObject.get(xObjectDetailApi);
 
       if (result?.status) {
         const data = result.data || {};
@@ -266,6 +272,7 @@ export default class EntityDetail extends React.PureComponent<
     const { loading, error } = this.state;
     const curAmisData = this.props.data || {};
     const systemInfo = curAmisData.__NeoSystemInfo || {};
+    console.log('this.props：', this.props);
 
     return (
       <div className="entity-detail-container">

package/src/template/neo-custom-cmp-template/src/components/object-card-list/model.ts

@@ -26,7 +26,7 @@ export class ObjectCardListModel {
     label: '数据卡片列表',
     xObjectDataApi: {
       xObjectApiKey: 'customContact__c',
-      fields: ['id', 'name', 'phone__c'],
+      fields: ['name', 'phone__c'],
     },
   };
 
@@ -52,6 +52,13 @@ export class ObjectCardListModel {
       name: 'xObjectDataApi',
       label: '实体数据源',
       placeholder: '请选择实体数据源',
+      /*
+      // 返回的数值格式：
+      value: {
+        xObjectApiKey: 'customContact__c',
+        fields: ['name', 'phone__c'],
+      },
+      */
     },
   ];
 

package/src/template/neo-custom-cmp-template/src/components/xobject-table/index.tsx

@@ -31,6 +31,8 @@ import {
 import moment from 'moment';
 // @ts-ignore
 import { xObject } from 'neo-open-api'; // Neo Open API
+// @ts-ignore
+import isEqual from 'lodash/isEqual';
 import './style.scss';
 
 const { Option } = Select;
@@ -43,6 +45,9 @@ interface XObjectTableProps {
   xObjectDataApi: {
     xObjectApiKey: string;
     fields: string[];
+    fieldDescList?: any[];
+    pageSize?: number;
+    page?: number;
   };
   /** Neo 平台传递的数据，包含系统信息等 */
   data?: any;
@@ -120,7 +125,7 @@ export default class XObjectTable extends React.PureComponent<
   constructor(props: XObjectTableProps) {
     super(props);
     const { xObjectDataApi } = props;
-    const { xObjectApiKey, fields } = xObjectDataApi || {};
+    const { xObjectApiKey, fields, page, pageSize } = xObjectDataApi || {};
 
     // 初始化组件状态
     this.state = {
@@ -129,8 +134,8 @@ export default class XObjectTable extends React.PureComponent<
       loading: false,
       error: null,
       pagination: {
-        current: 1,
-        pageSize: 10,
+        current: page || 1,
+        pageSize: pageSize || 10,
         total: 0,
       },
       isModalVisible: false,
@@ -143,10 +148,10 @@ export default class XObjectTable extends React.PureComponent<
     if (xObjectApiKey) {
       // 初始化字段列表、加载数据和业务类型列表
       this.getEntityTypeList(xObjectApiKey);
-      this.loadFieldList(xObjectApiKey);
+      this.loadFieldList();
 
       if (fields) {
-        this.loadData();
+        this.loadData(page, pageSize);
       }
     }
 
@@ -165,16 +170,29 @@ export default class XObjectTable extends React.PureComponent<
    * 当 xObjectApiKey 发生变化时重新加载数据
    */
   async componentDidUpdate(prevProps: XObjectTableProps) {
-    const { xObjectApiKey } = this.props.xObjectDataApi || {};
-    const { xObjectApiKey: prevXObjectApiKey } = prevProps.xObjectDataApi || {};
-    if (xObjectApiKey !== prevXObjectApiKey) {
+    const { xObjectApiKey, fields, page, pageSize } =
+      this.props.xObjectDataApi || {};
+    const {
+      xObjectApiKey: prevXObjectApiKey,
+      fields: prevFields,
+      page: prevPage,
+      pageSize: prevPageSize,
+    } = prevProps.xObjectDataApi || {};
+    if (
+      xObjectApiKey !== prevXObjectApiKey ||
+      !isEqual(fields, prevFields) ||
+      page !== prevPage ||
+      pageSize !== prevPageSize
+    ) {
       if (xObjectApiKey) {
-        this.loadData();
-        this.getEntityTypeList(xObjectApiKey);
-        this.loadFieldList(xObjectApiKey);
+        // 先加载字段列表，等待完成后再加载数据，确保字段信息已更新
+        await this.loadFieldList();
+        await this.getEntityTypeList(xObjectApiKey);
+        this.loadData(page, pageSize);
       } else {
         this.setState({
           dataSource: [],
+          fieldList: [],
         });
       }
     }
@@ -200,19 +218,26 @@ export default class XObjectTable extends React.PureComponent<
    * 加载字段列表
    * 从 Neo 平台获取 XObject 的字段描述信息
    */
-  async loadFieldList(xObjectApiKey?: string) {
-    if (!xObjectApiKey) return;
-
-    try {
-      const resultData = await xObject.getDesc(xObjectApiKey);
-      if (resultData && resultData.status) {
-        const result = resultData.data || {};
-        const fieldList = result.fields || [];
-        this.setState({ fieldList, title: result.label });
+  async loadFieldList() {
+    const { xObjectDataApi } = this.props || {};
+
+    // 方式一：直接从 props.xObjectDetailApi 中获取字段描述
+    if (xObjectDataApi && xObjectDataApi.fieldDescList) {
+      this.setState({ fieldList: xObjectDataApi.fieldDescList });
+    } else {
+      // 方式二：自行通过 OpenAPI SDK 获取字段描述
+      if (!xObjectDataApi.xObjectApiKey) return;
+      try {
+        const resultData = await xObject.getDesc(xObjectDataApi.xObjectApiKey);
+        if (resultData && resultData.status) {
+          const result = resultData.data || {};
+          const fieldList = result.fields || [];
+          this.setState({ fieldList, title: result.label });
+        }
+      } catch (error) {
+        console.error('获取字段列表失败:', error);
+        message.error('获取字段列表失败');
       }
-    } catch (error) {
-      console.error('获取字段列表失败:', error);
-      message.error('获取字段列表失败');
     }
   }
 
@@ -292,19 +317,14 @@ export default class XObjectTable extends React.PureComponent<
    * @param pageSize 每页条数，默认为 10
    */
   async loadData(page = 1, pageSize = 10) {
-    const { xObjectApiKey, fields } = this.props.xObjectDataApi || {};
+    const { xObjectApiKey } = this.props.xObjectDataApi || {};
     if (!xObjectApiKey) return;
 
     this.setState({ loading: true, error: null });
 
     try {
       // 获取所有字段的 API Key=
-      const result = await xObject.query({
-        xObjectApiKey,
-        fields,
-        page,
-        pageSize,
-      });
+      const result = await xObject.query(this.props.xObjectDataApi);
 
       if (result && result.status) {
         const records = result.data || [];
@@ -661,6 +681,7 @@ export default class XObjectTable extends React.PureComponent<
     const systemInfo = curAmisData.__NeoSystemInfo || {};
     const { xObjectApiKey } = this.props.xObjectDataApi || {};
     const columns = this.generateColumns();
+    console.log('this.props：', this.props);
 
     return (
       <div className="xobject-table-container">
@@ -718,6 +739,7 @@ export default class XObjectTable extends React.PureComponent<
                 />
               ) : (
                 <Table
+                  key={`${xObjectApiKey}-${columns.length}`}
                   columns={columns}
                   dataSource={dataSource}
                   rowKey="id"

package/src/template/neo-custom-cmp-template/src/components/xobject-table/model.ts

@@ -13,7 +13,7 @@ export class XObjectTableModel {
   // cmpType: string = 'xobject-table';
 
   /** 组件名称，用于设置在编辑器左侧组件面板中展示的名称 */
-  label: string = '实体对象数据';
+  label: string = '实体数据表格';
 
   /** 组件描述，用于设置在编辑器左侧组件面板中展示的描述 */
   description: string = '基于 XObject 的数据表格组件，支持增删改查操作';
@@ -32,17 +32,13 @@ export class XObjectTableModel {
     showDeleteButton: true,
     xObjectDataApi: {
       xObjectApiKey: 'customContact__c',
-      fields: ['id', 'name', 'phone__c'],
+      fields: ['name', 'phone__c'],
     },
   };
 
   /** 设计器端预览时展示的默认数据 */
   previewComProps = {
     title: '实体数据表格',
-    xObjectDataApi: {
-      xObjectApiKey: 'customContact__c',
-      fields: ['id', 'name', 'phone__c'],
-    },
   };
 
   /**
@@ -100,7 +96,7 @@ export class XObjectTableModel {
       label: '实体数据源',
       value: {
         xObjectApiKey: 'customContact__c',
-        fields: ['id', 'name', 'phone__c'],
+        fields: ['name', 'phone__c'],
       },
       placeholder: '请选择实体数据源',
       custom: true,

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

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^9.1.1",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

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

@@ -46,7 +46,7 @@
     "@commitlint/config-conventional": "^9.1.1",
     "@types/react": "^16.9.11",
     "@types/react-dom": "^16.9.15",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/vue2-custom-cmp-template/package.json

@@ -44,7 +44,7 @@
   "devDependencies": {
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^9.1.1",
-    "neo-cmp-cli": "^1.2.15",
+    "neo-cmp-cli": "^1.2.17",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",