@chamn/render 0.0.7 → 0.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chamn/render",
   "private": false,
-  "version": "0.0.7",
+  "version": "0.0.9",
   "publishConfig": {
     "access": "public"
   },
@@ -11,13 +11,15 @@
   "scripts": {
     "start": "build-script",
     "build": "build-script --build",
+    "build:analyze": "build-script --build --analyze",
     "build:w": "build-script --build --watch",
     "lint": "eslint --ext .tsx,.ts src/",
     "prettier": "prettier --write ./src",
     "test": "jest"
   },
   "dependencies": {
-    "@chamn/model": "0.0.7",
+    "@chamn/model": "0.0.9",
+    "cross-env": "^7.0.3",
     "html-tag-names": "^2.0.1",
     "loadjs": "4.3.0-rc1",
     "lodash-es": "^4.17.21",
@@ -27,9 +29,9 @@
     "zustand": "^4.1.5"
   },
   "devDependencies": {
-    "@chamn/build-script": "0.0.7",
-    "@chamn/demo-page": "0.0.7",
-    "@chamn/material": "0.0.7",
+    "@chamn/build-script": "0.0.9",
+    "@chamn/demo-page": "0.0.9",
+    "@chamn/material": "0.0.9",
     "@types/loadjs": "^4.0.1",
     "@types/lodash-es": "^4.17.6",
     "@types/react": "^18.0.15",
@@ -38,5 +40,5 @@
     "react-router-dom": "^6.6.1"
   },
   "config": {},
-  "gitHead": "0c7375f745549dc8f9903c725a209165907a7833"
+  "gitHead": "f073439ea704830a6f62146c916c2f0348c2e531"
 }

package/src/index.ts

@@ -3,3 +3,4 @@ export * from './core/adapterReact';
 export * from './core/render';
 export * from './core/designReactRender';
 export * from './util/assetsLoader';
+export * from './util';

package/src/util/assetsLoader.ts

@@ -45,19 +45,20 @@ export class AssetLoader {
       this._onSuccessList.forEach((el) => el());
       return;
     }
-    // 在下一个事件循环执行，确保 onSuccess 和 onError 被注册
-    setTimeout(() => {
+
+    return new Promise((resolve, reject) => {
+      // 在下一个事件循环执行，确保 onSuccess 和 onError 被注册
       loadjs.ready(ids, {
         success: () => {
           this._onSuccessList.forEach((el) => el());
+          resolve('');
         },
         error: (depsNotFound) => {
           this._onErrorList.forEach((el) => el(depsNotFound));
+          reject(depsNotFound);
         },
       });
-    }, 0);
-
-    return this;
+    });
   }
 
   onSuccess(cb: () => void) {

package/src/util/index.ts

@@ -2,6 +2,7 @@ import { capitalize } from 'lodash-es';
 import { Component, createElement } from 'react';
 import { ContextType } from '../core/adapter';
 import { StoreManager } from '../core/storeManager';
+import { AssetPackage } from '@chamn/model';
 
 export const isClass = function (val: any) {
   if (!val) {
@@ -127,3 +128,37 @@ export const getCSSTextValue = (cssObj: Record<string, string>) => {
   });
   return res;
 };
+
+export const collectVariable = (assetPackages: AssetPackage[], win: Window) => {
+  const res: Record<string, any> = {};
+  assetPackages.forEach((el) => {
+    if (el.globalName) {
+      const target = (win as any)[el.globalName];
+      if (target) {
+        res[el.globalName] = target;
+      }
+    }
+  });
+  return res;
+};
+
+export const flatObject = (obj: Record<string, any>, level = 1) => {
+  let count = 0;
+  let currentObj = obj;
+  let newObj: Record<string, any> = {};
+  let res = {};
+  while (count < level) {
+    Object.keys(currentObj).forEach((key) => {
+      newObj = {
+        ...newObj,
+        ...currentObj[key],
+      };
+    });
+    res = newObj;
+    currentObj = newObj;
+    newObj = {};
+    count += 1;
+  }
+
+  return res;
+};