antd-management-fast-develop 1.1.74 → 1.1.81

package/bin/cli.js

@@ -19,6 +19,7 @@ program
   .command('generate')
   .description('generate file from data source and template')
   .option('--dataPath <string>', 'data json source file path')
+  .option('--dataExtraPath <string>', 'data extra json source file path')
   .option(
     '--relativeFolder <bool>',
     'file will be generate by the relative folder path, default is "."',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-develop",
-  "version": "1.1.74",
+  "version": "1.1.81",
   "description": "",
   "license": "ISC",
   "author": "",
@@ -18,7 +18,7 @@
     "types/"
   ],
   "scripts": {
-    "ejs:test": "node ./bin/cli.js generate --dataPath ./src/data.json",
+    "ejs:test": "node ./bin/cli.js generate --dataPath ./src/data.json --dataExtraPath ./src/data.extra.json",
     "precommit": "npm run z:lint:staged:quiet",
     "publish:npm": "npm publish --registry https://registry.npmjs.org/",
     "z:auto:adjust:file": "echo can exec some file adjust command with here",
@@ -50,39 +50,39 @@
     "z:tsc:build": "echo show tsc version and create declaration file && tsc -v && tsc -p ./tsconfig.types.json && echo declaration file generate complete"
   },
   "dependencies": {
-    "@umijs/max": "^4.1.10",
+    "@umijs/max": "^4.2.1",
     "commander": "^12.0.0",
     "ejs": "^3.1.10",
     "rimraf": "^5.0.5",
-    "umi": "^4.1.10"
+    "umi": "^4.2.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.4",
-    "@babel/eslint-parser": "^7.24.1",
+    "@babel/core": "^7.24.5",
+    "@babel/eslint-parser": "^7.24.5",
     "@babel/plugin-external-helpers": "^7.24.1",
     "@babel/plugin-proposal-decorators": "^7.24.1",
     "@babel/plugin-transform-class-properties": "^7.24.1",
     "@babel/plugin-transform-private-methods": "^7.24.1",
-    "@babel/plugin-transform-private-property-in-object": "^7.24.1",
+    "@babel/plugin-transform-private-property-in-object": "^7.24.5",
     "@babel/plugin-transform-runtime": "^7.24.3",
-    "@babel/preset-env": "^7.24.4",
+    "@babel/preset-env": "^7.24.5",
     "@babel/preset-react": "^7.24.1",
-    "@babel/runtime": "^7.24.4",
+    "@babel/runtime": "^7.24.5",
     "@changesets/cli": "^2.27.1",
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
     "@commitlint/config-pnpm-scopes": "^19.1.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.13",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.12.7",
-    "@typescript-eslint/parser": "^7.7.1",
+    "@types/node": "^20.12.11",
+    "@typescript-eslint/parser": "^7.8.0",
     "babel-jest": "^29.7.0",
     "commitizen": "^4.3.0",
-    "conventional-changelog-conventionalcommits": "^7.0.2",
+    "conventional-changelog-conventionalcommits": "^8.0.0",
     "cross-env": "^7.0.3",
     "cz-git": "^1.9.1",
     "documentation": "^14.0.3",
-    "easy-soft-develop": "^2.1.73",
+    "easy-soft-develop": "^2.1.92",
     "eslint": "^8.57.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^18.0.0",
@@ -91,7 +91,7 @@
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^28.3.0",
+    "eslint-plugin-jest": "^28.5.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-promise": "^6.1.1",
@@ -109,7 +109,7 @@
     "react": "^18.3.1",
     "react-dnd": "^16.0.1",
     "rimraf": "^5.0.5",
-    "stylelint": "^16.4.0",
+    "stylelint": "^16.5.0",
     "stylelint-config-css-modules": "^4.4.0",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-standard": "^36.0.0",

package/src/cliCollection/generate.js

@@ -3,6 +3,7 @@
 /* eslint-disable no-useless-escape */
 
 const {
+  writeFileSync,
   promptWarn,
   checkStringIsEmpty,
   readJsonFileSync,
@@ -10,56 +11,103 @@ const {
   exit,
   promptInfo,
   exec,
+  mkdirSync,
 } = require('easy-soft-develop');
 const { generate } = require('../tools/generate');
 
 exports.run = function (s, o) {
   const {
-    _optionValues: { dataPath = '', relativeFolder = '.' },
+    _optionValues: { dataPath = '', dataExtraPath = '', relativeFolder = '.' },
   } = o;
 
-  if (checkStringIsEmpty(dataPath)) {
-    promptWarn('please input data json file path, use --help to get help info');
+  if (checkStringIsEmpty(dataPath) && checkStringIsEmpty(dataExtraPath)) {
+    promptWarn(
+      'please input data json file path or data extra json file path, use --help to get help info',
+    );
 
     exit();
   }
 
-  const data = readJsonFileSync(dataPath);
+  const removeCmd = `npx rimraf ${relativeFolder}/FunctionExtra`;
 
-  if (isObject(data)) {
-    if (Array.isArray(data.list)) {
+  promptInfo(`remove FunctionExtra: ${removeCmd}`);
+
+  exec(removeCmd);
+
+  mkdirSync(`${relativeFolder}/FunctionExtra`, {
+    recursive: true,
+  });
+
+  let crateFileSuccess = false;
+
+  let exportList = [];
+
+  if (!checkStringIsEmpty(dataPath)) {
+    const data = readJsonFileSync(dataPath);
+
+    if (isObject(data) && Array.isArray(data.list)) {
       promptInfo('File will generate, please wait a moment');
 
-      generate(data.list, relativeFolder);
+      const list = generate(data.list, relativeFolder);
+
+      crateFileSuccess = true;
 
-      const cmdEslint = `npx eslint --fix --cache --ext .js,.jsx,.ts,.tsx ${relativeFolder}/`;
+      exportList = [...exportList, ...list];
+    }
+  }
 
-      promptInfo(`Eslint generated file: ${cmdEslint}`);
+  if (!checkStringIsEmpty(dataExtraPath)) {
+    const dataExtra = readJsonFileSync(dataExtraPath);
 
-      exec(cmdEslint);
+    if (isObject(dataExtra) && Array.isArray(dataExtra.list)) {
+      promptInfo('File extra will generate, please wait a moment');
 
-      const cmdFormat = `npx prettier --cache --write ${relativeFolder}/`;
+      const list = generate(dataExtra.list, relativeFolder);
 
-      promptInfo(`Format generated file: ${cmdFormat}`);
+      crateFileSuccess = true;
 
-      exec(cmdFormat);
-    } else {
-      const simple = {
-        list: [
-          {
-            functionSegment: 'SimpleStatus',
-            label: '状态',
-            name: 'status',
-          },
-        ],
-      };
+      exportList = [...exportList, ...list];
+    }
+  }
 
-      promptWarn(
-        `in the data json file, key "list" value is not an array, it must be like this ${JSON.stringify(
-          simple,
-        )}`,
+  if (crateFileSuccess) {
+    if (exportList.length > 0) {
+      writeFileSync(
+        `${relativeFolder}/FunctionExtra/index.jsx`,
+        exportList.join(''),
+        {
+          coverFile: true,
+        },
       );
     }
+
+    const cmdEslint = `npx eslint --fix --cache --ext .js,.jsx,.ts,.tsx ${relativeFolder}/`;
+
+    promptInfo(`Eslint generated file: ${cmdEslint}`);
+
+    exec(cmdEslint);
+
+    const cmdFormat = `npx prettier --cache --write ${relativeFolder}/`;
+
+    promptInfo(`Format generated file: ${cmdFormat}`);
+
+    exec(cmdFormat);
+  } else {
+    const simple = {
+      list: [
+        {
+          functionSegment: 'SimpleStatus',
+          label: '状态',
+          name: 'status',
+        },
+      ],
+    };
+
+    promptWarn(
+      `in the data json file, key "list" value is not an array, it must be like this ${JSON.stringify(
+        simple,
+      )}`,
+    );
   }
 
   exit();

package/src/data.extra.json

@@ -0,0 +1,9 @@
+{
+  "list": [
+    {
+      "functionSegment": "Brand",
+      "label": "商品品牌",
+      "name": "brandId"
+    }
+  ]
+}

package/src/data.json

@@ -4,11 +4,6 @@
       "functionSegment": "SimpleStatus",
       "label": "状态",
       "name": "status"
-    },
-    {
-      "functionSegment": "Brand",
-      "label": "商品品牌",
-      "name": "brandId"
     }
   ]
 }

package/src/tools/generate.js

@@ -9,23 +9,11 @@ const {
   promptSuccess,
   promptWarn,
   promptEmptyLine,
-  exec,
-  promptInfo,
 } = require('easy-soft-develop');
 
 let { templateContent } = require('../template');
 
 function generate(dataSource, relativeFolder) {
-  const removeCmd = `npx rimraf ${relativeFolder}/FunctionExtra`;
-
-  promptInfo(`remove FunctionExtra: ${removeCmd}`);
-
-  exec(removeCmd);
-
-  mkdirSync(`${relativeFolder}/FunctionExtra`, {
-    recursive: true,
-  });
-
   const dataAdjust = dataSource.map((o) => adjustSource(o));
 
   const exportList = [];
@@ -52,15 +40,7 @@ function generate(dataSource, relativeFolder) {
     exportList.push(`export * from './${o.functionSegment}';`);
   }
 
-  if (exportList.length > 0) {
-    writeFileSync(
-      `${relativeFolder}/FunctionExtra/index.jsx`,
-      exportList.join(''),
-      {
-        coverFile: true,
-      },
-    );
-  }
+  return exportList;
 }
 
 function adjustSource(o) {