efront 4.22.18 → 4.23.0

package/coms/zimoli/zimoli.js

@@ -49,8 +49,8 @@ onhashchange(window, function (event) {
 });
 // body
 var location_pathname = location.pathname;
-var _zimoli_params_key = `_zimoli_parameters:${location_pathname}#`;
-var _zimoli_state_prefix = `_zimoli_page_state:${location_pathname}#`;
+var _zimoli_params_key = `紫茉莉:${location_pathname}#`;
+var _zimoli_state_prefix = `茉莉紫:${location_pathname}#`;
 
 function getReverseStyle(style) {
     if (!isObject(style)) {
@@ -317,6 +317,7 @@ function prepare(pgpath, ok) {
         //只能在page上使用
         _pageback_listener = handler;
     };
+    state.upwith = popup.upwith(_with_elements);
     state.titlebar = function () {
         var realTitleBar = titlebar.apply(null, arguments);
         if (!realTitleBar.parentNode) _with_elements.push(realTitleBar);
@@ -370,17 +371,18 @@ function create(pagepath, args, from, needroles) {
         var pg = pagepath;
         var { with: _with_elements = [], state = {}, onback: _pageback_listener, roles } = pg;
     }
+    var h = history[current_history];
     if (!checkroles(user.roles, roles) || !checkroles(user.roles, needroles)) {
         // 检查权限
         if (!user.isLogin && user.loginPath) {
             var pg = create(user.loginPath);
-            history[current_history].wardable = false;
+            if (h) h.wardable = false;
             return pg;
         }
         return alert(i18n`没有权限！`, 0);
     }
     if (!pg) return;
-    if (history[current_history]) history[current_history].wardable = true;
+    if (h) h.wardable = true;
     var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
@@ -388,8 +390,12 @@ function create(pagepath, args, from, needroles) {
     var _page = pg.call(state, args, from);
     if (undefined === args || null === args) args = {};
     if (_page) {
-        if (_with_length) _page.with = _with_elements.concat(_page.with || []);
-        _with_elements.splice(_with_length, _with_elements.length - _with_length);
+        var page_with = _with_elements.splice(_with_length, _with_elements.length - _with_length);
+        if (_page.with && _page.with !== _with_elements) {
+            page_with = page_with.concat(_page.with);
+            _with_elements.with = page_with;
+        }
+        _page.with = _with_elements;
         if (args.initialStyle) _page.initialStyle = args.initialStyle;
         if (args.holdupStyle) _page.holdupStyle = args.holdupStyle;
         if (_page.initialStyle && !_page.holdupStyle) {
@@ -455,7 +461,7 @@ var global = {};
 var history = {};
 var current_history, default_history = current_history = "";
 history[current_history] = createEmptyHistory('/main', false);
-var history_session_object_key = `_zimoli_history_key:${location_pathname}`;
+var history_session_object_key = `紫茉莉:${location_pathname}`;
 try {
     history = JSAM.parse(historyStorage.getItem(history_session_object_key)) || history;
 } catch (e) {
@@ -671,7 +677,8 @@ function addGlobal(element, name = null, isBack) {
             if (isBack) appendChild.insert(body, element);
             else appendChild(body, element);
         }
-        rootElements.push(element);
+        var upwith = element.$upwith || rootElements;
+        if (upwith.indexOf(element) < 0) upwith.push(element);
     }
     if (hasLock) fixurl(), fixLock = false;
 }

package/docs/version-desc.md

@@ -10,4 +10,6 @@
 
 4.0 No longer relying on `typescript` (nearly 170000 lines of source code), the compilation speed has increased by four times, the memory usage has been reduced to 1/8 of the original, and the self compilation time on GitHub has also been reduced to about 15 seconds.
 
-4.1 No longer relying on `less-node` or `pngjs`, while the `less-node` is replaced with [suxin](https://www.npmjs.com/package/suxin) from `efront`.
+4.1 No longer relying on `less-node` or `pngjs`, while the `less-node` is replaced with [suxin](https://www.npmjs.com/package/suxin) from `efront`.
+
+4.23 The `zimoli` library has adjusted the component rendering method to provide a relatively clean DOM for developers. When calling methods such as `on` and `render`, associated data is no longer attached to DOM elements (except for browsers without WeakMap). Code that uses corresponding underlying features needs to be modified.

package/docs//347/211/210/346/234/254/350/257/264/346/230/216.md

@@ -10,4 +10,6 @@
 
 4.0版本 不再依赖`typescipt`（近17万行源码），编译速度再次提升4倍，占用内存减少到原来的1/8，github上自我编译时间也减少到15秒左右。
 
-4.1版本 不再依赖`less-node`和`pngjs`，其中`less-node` 由`efront`自建的css工具[素馨](https://www.npmjs.com/package/suxin)代替。
+4.1版本 不再依赖`less-node`和`pngjs`，其中`less-node` 由`efront`自建的css工具[素馨](https://www.npmjs.com/package/suxin)代替。
+
+4.23版本 紫茉莉库`zimoli`调整组件渲染方式，给开发一个相对干净的DOM，调用`on`和`render`等方法时，不再将关联的数据挂载到dom元素，(无WeakMap的浏览器除外)，用到相应的底层特性的代码需要修改。

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.22.18",
+    "version": "4.23.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {