@easyv/react-component-builder 0.22.3-beta → 0.22.3

package/loaders/react-entry-loader.js

@@ -187,7 +187,7 @@ module.exports = function (content, map, meta) {
                 callback(error);
                 return true;
               }
-              /----------- common assets start -------------/
+              /----------- common assets start -------------/;
               let commonAssets;
               try {
                 let dataJsonFile = fs.existsSync(
@@ -203,7 +203,9 @@ module.exports = function (content, map, meta) {
                   );
                 } else {
                   delete require.cache[
-                    require.resolve(path.resolve(configPath, name + '.common.assets.js'))
+                    require.resolve(
+                      path.resolve(configPath, name + '.common.assets.js'),
+                    )
                   ];
                   commonAssets = require(path.resolve(
                     configPath,
@@ -215,8 +217,7 @@ module.exports = function (content, map, meta) {
                 // error.message += ` in ${configPath}${name}.common.assets.json or ${configPath}${name}.common.assets.js`;
                 // callback(error);
               }
-              /----------- common assets end -------------/
-
+              /----------- common assets end -------------/;
 
               if (names.has(config.base.module_name)) {
                 callback(
@@ -359,6 +360,13 @@ module.exports = function (content, map, meta) {
             item[keys.value] = values;
             return item;
           }
+          if (item.customField && typeof item.customField === 'function') {
+            const newItem = {
+              ...item,
+              customField: item.customField.toString(),
+            };
+            return newItem;
+          }
           return item;
         });
         if (!updateChart) {
@@ -377,7 +385,7 @@ module.exports = function (content, map, meta) {
         }
         // 公共资源配置
         if (main.commonAssets && Array.isArray(main.commonAssets)) {
-          mainConfig.commonAssets = main.commonAssets
+          mainConfig.commonAssets = main.commonAssets;
         }
 
         // 子组件排序，有配置项则以chilren排序，否则以文件顺序排序

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easyv/react-component-builder",
-  "version": "0.22.3-beta",
+  "version": "0.22.3",
   "files": [
     "launcher",
     "templates",
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@babel/core": "7.9.0",
-    "@babel/preset-env": "^7.24.1",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/register": "^7.10.4",
-    "@easyv/react-gui": "1.20.6",
-    "@easyv/simulator": "0.6.2-beta",
+    "@easyv/react-gui": "1.20.9",
+    "@easyv/simulator": "0.6.2",
     "@svgr/webpack": "8.1.0",
     "acorn": "^7.3.1",
     "acorn-jsx": "^5.2.0",
@@ -54,7 +54,6 @@
     "webpack-manifest-plugin": "4.1.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@easyv/sync-to-mirror": "^0.0.2",
     "@types/lodash": "^4.14.157",
     "@types/node": "^12.0.0",

package/utils/index.js

@@ -1,37 +1,38 @@
-const fs = require("fs");
-const path = require("path");
-const chalk = require("chalk");
+const fs = require('fs');
+const path = require('path');
+const chalk = require('chalk');
+const { appComponents } = require('../config/paths');
 
 // todo: 把这个替换掉
-require("@babel/register")({
-  presets: [require.resolve("@babel/preset-env")],
+require('@babel/register')({
+  presets: [require.resolve('@babel/preset-env')],
 });
 
 function getConfigContent(componentFolder) {
   let jsonFileExist = fs.existsSync(
-    path.join(componentFolder, "config/main.json")
+    path.join(componentFolder, 'config/main.json'),
   );
   if (jsonFileExist) {
     return JSON.parse(
-      fs.readFileSync(path.join(componentFolder, "config/main.json"), {
-        encoding: "utf8",
-      })
+      fs.readFileSync(path.join(componentFolder, 'config/main.json'), {
+        encoding: 'utf8',
+      }),
     );
   } else {
-    return require(path.resolve(componentFolder, "config/main.js")).default;
+    return require(path.resolve(componentFolder, 'config/main.js')).default;
   }
 }
 
 function getDataContent(componentFolder) {
   let jsonFileExist = fs.existsSync(
-    path.join(componentFolder, "config/main.data.json")
+    path.join(componentFolder, 'config/main.data.json'),
   );
   if (jsonFileExist) {
     return JSON.parse(
-      fs.readFileSync(path.join(componentFolder, "config/main.data.json"))
+      fs.readFileSync(path.join(componentFolder, 'config/main.data.json')),
     );
   } else {
-    return require(path.resolve(componentFolder, "config/main.data.js"))
+    return require(path.resolve(componentFolder, 'config/main.data.js'))
       .default;
   }
 }
@@ -47,33 +48,33 @@ module.exports.checkComponentFiles = function checkConfigs(folder) {
   }
 
   {
-    const oldConfigs = ["js/config.js", "mocks/data.js"];
+    const oldConfigs = ['js/config.js', 'mocks/data.js'];
     const exists = oldConfigs.every((file) =>
-      fs.existsSync(path.join(folder, file))
+      fs.existsSync(path.join(folder, file)),
     );
     if (exists) {
       // 垫一下变量名防止js访问变量空指针
       global.window = {
         appConfig: {},
-        ASSETS_URL: "",
+        ASSETS_URL: '',
       };
-      const base = require(path.resolve(folder, "js/config.js")).config.base;
+      const base = require(path.resolve(folder, 'js/config.js')).config.base;
       return { base };
     }
   }
 
-  const newConfigs = ["config/main", "config/main.data"];
+  const newConfigs = ['config/main', 'config/main.data'];
   newConfigs.every((file) => {
     if (
       !(
-        fs.existsSync(path.join(folder, file + ".js")) ||
-        fs.existsSync(path.join(folder, file + ".json"))
+        fs.existsSync(path.join(folder, file + '.js')) ||
+        fs.existsSync(path.join(folder, file + '.json'))
       )
     ) {
       console.error(
         chalk.red(
-          `${file}.js or ${file}.json cannot be found in folder ${folder}, if the folder is not a component folder please move it out.`
-        )
+          `${file}.js or ${file}.json cannot be found in folder ${folder}, if the folder is not a component folder please move it out.`,
+        ),
       );
       process.exit();
     }
@@ -87,5 +88,55 @@ module.exports.checkComponentFiles = function checkConfigs(folder) {
   };
 };
 
+function getComponentBase(name) {
+  const sourcePath = path.join(appComponents, name);
+  if (!fs.existsSync(sourcePath)) {
+    console.error(chalk.red(`cannot found folder ${sourcePath}.`));
+    process.exit();
+  }
+
+  //旧配置
+  if (
+    fs.existsSync(path.join(sourcePath, 'js/config.js')) &&
+    fs.existsSync(path.join(sourcePath, 'mocks/data.js'))
+  ) {
+    const base = require(path.resolve(sourcePath, 'js/config.js')).config.base;
+    return { base };
+  }
+
+  //新配置
+  const newConfigs = ['config/main', 'config/main.data'];
+  newConfigs.every((file) => {
+    if (
+      !(
+        fs.existsSync(path.join(sourcePath, file + '.js')) ||
+        fs.existsSync(path.join(sourcePath, file + '.json'))
+      )
+    ) {
+      console.error(
+        chalk.red(
+          `${file}.js or ${file}.json cannot be found in folder ${sourcePath}, if the folder is not a component folder please move it out.`,
+        ),
+      );
+      process.exit();
+    }
+    return true;
+  });
+
+  let base = {};
+  if (fs.existsSync(path.join(sourcePath, 'config/main.json'))) {
+    base = JSON.parse(
+      fs.readFileSync(path.join(sourcePath, 'config/main.json'), {
+        encoding: 'utf8',
+      }),
+    ).base;
+  } else {
+    base = require(path.resolve(sourcePath, 'config/main.js')).default.base;
+  }
+
+  return { base };
+}
+
 module.exports.getConfigContent = getConfigContent;
 module.exports.getDataContent = getDataContent;
+module.exports.getComponentBase = getComponentBase;