simple-boot-front 1.0.104 → 1.0.107

package/SimpleBootFront.d.ts

@@ -7,7 +7,9 @@ import { HttpService } from './service/HttpService';
 import { SimstanceManager } from 'simple-boot-core/simstance/SimstanceManager';
 import { IntentManager } from 'simple-boot-core/intent/IntentManager';
 import { RouterManager } from 'simple-boot-core/route/RouterManager';
-import { Config, TargetElement, TargetAttr } from 'dom-render/Config';
+import { Config } from 'dom-render/configs/Config';
+import { TargetAttr } from 'dom-render/configs/TargetAttr';
+import { TargetElement } from 'dom-render/configs/TargetElement';
 import { RouterModule } from 'simple-boot-core/route/RouterModule';
 export declare class SimpleBootFront extends SimpleApplication {
     rootRouter: ConstructorType<any>;
@@ -18,7 +20,7 @@ export declare class SimpleBootFront extends SimpleApplication {
     domRenderTargetAttrs: TargetAttr[];
     domRenderConfig: Config;
     constructor(rootRouter: ConstructorType<any>, option: SimFrontOption);
-    getComponentInnerHtml(targetObj: any): string;
+    getComponentInnerHtml(targetObj: any, id: string): string;
     createDomRender<T extends object>(obj: T): T;
     private initRun;
     initWriteRootRouter(): void;

package/SimpleBootFront.js

@@ -146,9 +146,9 @@ var SimpleBootFront = (function (_super) {
             if (attrValue) {
                 var targetObj = ScriptUtils_1.ScriptUtils.eval("return ".concat(attrValue), obj);
                 var n = element.cloneNode(true);
-                var innerHTML = _this.getComponentInnerHtml(targetObj);
+                var innerHTML = _this.getComponentInnerHtml(targetObj, rawSet.uuid);
                 n.innerHTML = innerHTML;
-                return RawSet_1.RawSet.drThisCreate(n, attrValue, '', true, obj, _this.option);
+                return RawSet_1.RawSet.drThisCreate(rawSet, n, attrValue, '', true, obj, _this.option);
             }
             var fag = _this.option.window.document.createDocumentFragment();
             return fag;
@@ -159,11 +159,11 @@ var SimpleBootFront = (function (_super) {
         };
         return _this;
     }
-    SimpleBootFront.prototype.getComponentInnerHtml = function (targetObj) {
-        var _a, _b, _c;
+    SimpleBootFront.prototype.getComponentInnerHtml = function (targetObj, id) {
+        var _a, _b;
         var component = (0, Component_1.getComponent)(targetObj);
-        var styles = ((_b = (_a = component === null || component === void 0 ? void 0 : component.styles) === null || _a === void 0 ? void 0 : _a.map(function (it) { return "<style>".concat(it, "</style>"); })) !== null && _b !== void 0 ? _b : []).join(' ');
-        var template = ((_c = component === null || component === void 0 ? void 0 : component.template) !== null && _c !== void 0 ? _c : '');
+        var styles = RawSet_1.RawSet.generateStyleTransform((_a = component === null || component === void 0 ? void 0 : component.styles) !== null && _a !== void 0 ? _a : [], id);
+        var template = ((_b = component === null || component === void 0 ? void 0 : component.template) !== null && _b !== void 0 ? _b : '');
         return styles + template;
     };
     SimpleBootFront.prototype.createDomRender = function (obj) {
@@ -203,13 +203,14 @@ var SimpleBootFront = (function (_super) {
         }
     };
     SimpleBootFront.prototype.writeRootRouter = function () {
-        var _a, _b, _c;
         var routerAtomic = new SimAtomic_1.SimAtomic(this.rootRouter, this.getSimstanceManager());
         var target = this.option.window.document.querySelector(this.option.selector);
         if (target && routerAtomic.value) {
-            var component = routerAtomic.getConfig(Component_1.ComponentMetadataKey);
-            var styles = ((_b = (_a = component === null || component === void 0 ? void 0 : component.styles) === null || _a === void 0 ? void 0 : _a.map(function (it) { return "<style>".concat(it, "</style>"); })) !== null && _b !== void 0 ? _b : []).join(' ');
-            target.innerHTML = "".concat(styles, " ").concat((_c = component === null || component === void 0 ? void 0 : component.template) !== null && _c !== void 0 ? _c : '');
+            var id = 'root-router';
+            var startEndPoint = RawSet_1.RawSet.createStartEndPoint(id, RawSet_1.RawSetType.TARGET_ELEMENT, this.domRenderConfig);
+            target.appendChild(startEndPoint.start);
+            target.insertAdjacentHTML('beforeend', this.getComponentInnerHtml(this.rootRouter, id));
+            target.appendChild(startEndPoint.end);
         }
         return routerAtomic;
     };
@@ -321,7 +322,7 @@ var SimpleBootFront = (function (_super) {
             var items = RawSet_1.RawSet.createComponentTargetElement(name, function (e, obj, r) {
                 var newSim = _this.simstanceManager.newSim(val);
                 return newSim;
-            }, component === null || component === void 0 ? void 0 : component.template, component === null || component === void 0 ? void 0 : component.styles, false, _this.domRenderConfig);
+            }, component === null || component === void 0 ? void 0 : component.template, component === null || component === void 0 ? void 0 : component.styles);
             _this.domRenderTargetElements.push(items);
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-boot-front",
-  "version": "1.0.104",
+  "version": "1.0.107",
   "main": "SimpleApplication.js",
   "license": "MIT",
   "description": "front end SPA frameworks",
@@ -72,7 +72,7 @@
     "typescript": "^4.4.3"
   },
   "dependencies": {
-    "dom-render": "^1.0.75",
-    "simple-boot-core": "^1.0.30"
+    "dom-render": "^1.0.86",
+    "simple-boot-core": "^1.0.31"
   }
 }