neo-cmp-cli 1.1.9 → 1.1.11

package/package.json

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

package/src/cmpUtils/createCommonModulesCode.js

@@ -16,23 +16,35 @@ const createCommonModulesCode = (neoExports) => {
 
   // 根据 neoExports 获取共享的依赖模块
   if (Array.isArray(neoExports) && neoExports.length > 0) {
-    neoExports.forEach(module => {
+    neoExports.forEach((module) => {
       CustomCmpCommonModules[module] = require(module);
     });
-  } else if (isPlainObject(neoExports)) {
-    CustomCmpCommonModules = Object.assign(CustomCmpCommonModules, neoExports);
+  } else if (isPlainObject(neoExports) && Object.keys(neoExports).length > 0) {
+    Object.keys(neoExports).forEach((moduleId) => {
+      CustomCmpCommonModules[moduleId] = `require('${neoExports[moduleId]}')`;
+    });
   } else {
-    console.error('neoExports 格式不正确，请检查 neo.config.js 文件中的 neoCommonModule / neoExports 配置');
+    console.error(
+      'neoExports 格式不正确，请检查 neo.config.js 文件中的 neoCommonModule / neoExports 配置'
+    );
     process.exit(1);
-    return '';
   }
 
+  // 构建 CustomCmpCommonModules 对象的代码字符串
+  let customCmpCommonModulesCode = '{\n';
+  const moduleEntries = Object.entries(CustomCmpCommonModules);
+  moduleEntries.forEach(([moduleId, moduleValue], index) => {
+    const isLast = index === moduleEntries.length - 1;
+    customCmpCommonModulesCode += `  "${moduleId}": ${moduleValue}${isLast ? '' : ','}\n`;
+  });
+  customCmpCommonModulesCode += '}';
+
   const commonModulesCode = `
 /**
  * 自定义组件 共享出来的依赖模块
  * 备注：可在其他模块中通过 neoRequire 中使用
  */
-const CustomCmpCommonModules = ${JSON.stringify(CustomCmpCommonModules)};
+const CustomCmpCommonModules = ${customCmpCommonModulesCode};
 
 // 用于添加共享的依赖模块
 const addNeoCommonModules = (modules) => {

package/src/module/main.js

@@ -125,13 +125,19 @@ module.exports = {
       curConfig.dev.externals = neoExternals;
     }
 
-    if (cmpNeoExports && Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) {
+    if (
+      cmpNeoExports &&
+      ((Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) ||
+        (_.isPlainObject(cmpNeoExports) && Object.keys(cmpNeoExports).length > 0))
+    ) {
       const commonModulesFilePath = createCommonModulesCode(cmpNeoExports);
 
       // 所有入口文件添加 commonModulesFile
       if (curConfig.dev.entry) {
         Object.keys(curConfig.dev.entry).forEach((name) => {
-          webpackDevConfig.entry[name] = [commonModulesFilePath].concat(webpackDevConfig.entry[name]);
+          curConfig.dev.entry[name] = [commonModulesFilePath].concat(
+            curConfig.dev.entry[name]
+          );
         });
       }
     }
@@ -230,19 +236,25 @@ module.exports = {
 
     // 添加 内置 Neo 的 externals 配置
     const neoExternals = getExternalsByNeoCommonModules(cmpNeoExternals);
-    if (curConfig.build2lib.externals && _.isPlainObject(curConfig.dev.externals)) {
+    if (curConfig.build2lib.externals && _.isPlainObject(curConfig.build2lib.externals)) {
       curConfig.build2lib.externals = Object.assign(curConfig.build2lib.externals, neoExternals);
     } else {
       curConfig.build2lib.externals = neoExternals;
     }
 
-    if (cmpNeoExports && Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) {
+    if (
+      cmpNeoExports &&
+      ((Array.isArray(cmpNeoExports) && cmpNeoExports.length > 0) ||
+        (_.isPlainObject(cmpNeoExports) && Object.keys(cmpNeoExports).length > 0))
+    ) {
       const commonModulesFilePath = createCommonModulesCode(cmpNeoExports);
 
       // 所有入口文件添加 commonModulesFile
-      if (curConfig.dev.entry) {
-        Object.keys(curConfig.dev.entry).forEach((name) => {
-          webpackDevConfig.entry[name] = [commonModulesFilePath].concat(webpackDevConfig.entry[name]);
+      if (curConfig.build2lib.entry) {
+        Object.keys(curConfig.build2lib.entry).forEach((name) => {
+          curConfig.build2lib.entry[name] = [commonModulesFilePath].concat(
+            curConfig.build2lib.entry[name]
+          );
         });
       }
     }

package/src/neo/neoRequire.js

@@ -28,8 +28,8 @@ const getExternalsByNeoCommonModules = (cmpNeoExternals) => {
   });
 
   // 如果自定义组件有共享的依赖模块，则合并到 neoExternals 中
-  if (cmpNeoExternals && _.isPlainObject(cmpNeoExternals) && Object.keys(cmpNeoExternals).length > 0) {
-    Object.keys(cmpNeoExternals).forEach(moduleName => {
+  if (cmpNeoExternals && cmpNeoExternals.length > 0) {
+    cmpNeoExternals.forEach(moduleName => {
       neoExternals[moduleName] = `commonjs ${moduleName}`;
     });
   }

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

@@ -41,8 +41,8 @@ module.exports = {
   // Neo 共享依赖模块
   neoCommonModule: {
     // neoExports: ['echarts'], // 自定义组件 共享出来的模块，支持数组和对象
-    // neoExports: {},
-    neoExternals: ['neo-register'], // 自定义组件 需要剔除的模块，仅支持数组写法
+    // neoExports: {}, // 对象写法
+    // neoExternals: ['neo-register', 'chart-widget'], // 自定义组件 需要剔除的模块，仅支持数组写法
   },
   preview: {
     // 用于开启本地预览模式的相关配置信息

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

@@ -1,6 +1,6 @@
 {
   "name": "antd-custom-cmp-template",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "neo自定义组件模板（react&ts技术栈）",
   "keywords": [
     "自定义组件模板",
@@ -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.1.8",
+    "neo-cmp-cli": "^1.1.11",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5"

package/src/template/antd-custom-cmp-template/src/components/data-dashboard/style.scss

@@ -254,11 +254,11 @@
       border: 1px solid rgba(51, 65, 85, 0.5);
       backdrop-filter: blur(20px);
       color: var(--text-inverse);
-      
+
       .dashboard-title {
         color: var(--text-inverse);
       }
-      
+
       .user-info {
         .user-name {
           color: var(--text-inverse);
@@ -275,86 +275,86 @@
       border: 1px solid rgba(51, 65, 85, 0.5);
       color: var(--text-inverse);
       backdrop-filter: blur(20px);
-      
+
       .ant-card-head-title {
         color: var(--text-inverse);
       }
-      
+
       .ant-statistic-title {
         color: var(--text-inverse);
       }
-      
+
       .ant-statistic-content-value {
         color: var(--text-inverse);
       }
-      
+
       .metric-trend {
         .trend-text {
           color: var(--text-inverse);
         }
       }
-      
+
       .product-name {
         color: var(--text-inverse);
       }
-      
+
       .product-sales {
         color: rgba(255, 255, 255, 0.7);
       }
-      
+
       .activity-text {
         .user-name {
           color: var(--primary-light);
         }
-        
+
         .action {
           color: var(--text-inverse);
         }
       }
-      
+
       .activity-time {
         color: rgba(255, 255, 255, 0.7);
       }
-      
+
       .performance-header {
         .metric-name {
           color: var(--text-inverse);
         }
-        
+
         .metric-value {
           color: var(--primary-light);
         }
       }
-      
+
       .performance-target {
         color: rgba(255, 255, 255, 0.7);
       }
-      
+
       .active-users-description {
         color: rgba(255, 255, 255, 0.7);
       }
-      
+
       .active-users-number {
         .unit {
           color: rgba(255, 255, 255, 0.7);
         }
       }
-      
+
       .ant-btn {
         color: var(--text-inverse);
         border-color: rgba(255, 255, 255, 0.3);
-        
+
         &:hover {
           color: var(--text-inverse);
           border-color: var(--primary-light);
         }
       }
-      
+
       .ant-tag {
         color: var(--text-inverse);
         border-color: rgba(255, 255, 255, 0.3);
       }
-      
+
       .ant-progress-text {
         color: var(--text-inverse);
       }

package/src/template/antd-custom-cmp-template/src/components/{info-card → info-card2}/index.tsx

@@ -2,6 +2,8 @@ import * as React from 'react';
 import { Avatar } from 'antd';
 import { UserOutlined } from '@ant-design/icons';
 import './style.scss'; // 组件内容样式
+// @ts-ignore
+// import ChartWidget from 'chart-widget'; // 另一个自定义组件导出的模块
 
 interface InfoCardProps {
   title: string;
@@ -66,6 +68,24 @@ export default class InfoCard extends React.PureComponent<InfoCardProps> {
             </div>
           )}
         </div>
+        {/*
+        <ChartWidget
+          chartType="line"
+          title="销售趋势"
+          subtitle="2025年数据"
+          width={800}
+          height={400}
+          mockData={{
+            xAxis: ['1月', '2月', '3月', '4月', '5月', '6月'],
+            series: [
+              {
+                name: '销售额',
+                data: [120, 200, 150, 80, 70, 110],
+              },
+            ],
+          }}
+        />
+        */}
       </div>
     );
   }

package/src/template/antd-custom-cmp-template/src/components/{info-card → info-card2}/model.ts

@@ -9,7 +9,7 @@ export class InfoCardModel {
   // cmpType: string = 'info-card';
 
   // 组件名称，用于设置在编辑器左侧组件面板中展示的名称
-  label: string = '信息卡片';
+  label: string = '信息卡片2';
 
   // 组件描述，用于设置在编辑器左侧组件面板中展示的描述
   description: string = '信息展示卡片';

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

@@ -39,12 +39,12 @@ module.exports = {
     // babelPlugins: [],
   },
   neoCommonModule: {
-    // neoExports: ['echarts'], // 自定义组件 共享出来的模块，支持数组和对象
+    // neoExports: [], // 自定义组件 共享出来的模块，支持数组和对象
     neoExports: {
-      'neo/chart-widget': require('./src/components/chart-widget'),
-      'neo-register': require('neo-register'),
+      'chart-widget': path.resolve('./src/components/chart-widget'), // 导出图表自定义组件
+      'neo-register': 'neo-register', // 导出 Neo 注册模块
     },
-    neoExternals: ['echarts'], // 自定义组件 需要剔除的模块，仅支持数组写法
+    // neoExternals: [], // 自定义组件 需要剔除的模块，仅支持数组写法
   },
   preview: {
     // 用于开启本地预览模式的相关配置信息

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

@@ -1,6 +1,6 @@
 {
   "name": "echarts-custom-cmp-template",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "neo自定义组件模板（react&ts技术栈）",
   "keywords": [
     "自定义组件模板",
@@ -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.1.8",
+    "neo-cmp-cli": "^1.1.11",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",

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

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

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.1.8",
+    "neo-cmp-cli": "^1.1.11",
     "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.1.8",
+    "neo-cmp-cli": "^1.1.11",
     "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.1.8",
+    "neo-cmp-cli": "^1.1.11",
     "husky": "^4.2.5",
     "lint-staged": "^10.2.9",
     "prettier": "^2.0.5",