efront 3.5.7 → 3.5.11

package/coms/zimoli/menuList.less

@@ -1,38 +1,42 @@
 & {
-    display         : inline-block;
-    width           : auto;
-    height          : auto;
+    display: inline-block;
+    width: auto;
+    height: auto;
     background-color: #fff;
-    box-shadow      : 0 0 20px -6px rgba(0, 0, 0, .6);
-    line-height     : 28px;
-    padding         : 6px 0;
+    box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
+    border: 1px solid #0003;
+    line-height: 28px;
+    padding: 6px 0;
 
     >menu-item {
-        display         : block;
-        position        : relative;
-        padding         : 0 16px;
-        border-radius   : 0;
+        display: block;
+        position: relative;
+        padding: 0 16px;
+        border-radius: 0;
         background-color: inherit;
-        color           : inherit;
-        box-shadow      : none;
-        text-align      : inherit;
+        color: inherit;
+        box-shadow: none;
+        text-align: inherit;
+        &.warn{
+            color: #c28;
+        }
 
         &.has-children {
             padding: 0 24px 0 16px;
 
             &:after {
-                content    : ">";
-                display    : block;
-                width      : 20px;
-                height     : 20px;
+                content: ">";
+                display: block;
+                width: 20px;
+                height: 20px;
                 line-height: 20px;
-                font-size  : 18px;
-                transform  : scaleX(.56);
-                position   : absolute;
-                right      : 6px;
-                top        : 50%;
-                margin-top : -10px;
-                text-align : right;
+                font-size: 18px;
+                transform: scaleX(.56);
+                position: absolute;
+                right: 6px;
+                top: 50%;
+                margin-top: -10px;
+                text-align: right;
             }
         }
 
@@ -41,5 +45,5 @@
 
 i {
     display: inline-block;
-    width  : 20px;
+    width: 20px;
 }

package/coms/zimoli/model.js

@@ -142,7 +142,7 @@ function main(elem) {
                 elem.setAttribute("type", field_type);
             }
             remove(elem.children);
-            if (readonly) {
+            if (readonly || field.readonly) {
                 if (field_type === "function") {
                     field_editor(elem);
                 } else {

package/coms/zimoli/render.js

@@ -51,7 +51,7 @@ function rebuild(element) {
         dispatch(event, element);
     }
 }
-var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s]|\?\s*\.(?=[^\d])|\s*\.\s*)+/g;
+var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s\[\]\(\)]|\?\s*\.(?=[^\d])|\s*\.\s*)+/g;
 var createGetter = function (search, isprop = true) {
     var [withContext, searchContext] = search;
     if (!searchContext) return function () { };
@@ -62,12 +62,12 @@ var createGetter = function (search, isprop = true) {
             context.split(/\?\s*\.(?=[^\d])/).forEach(function (search) {
                 if (dist) {
                     if (/[\=]/.test(dist)) dist = `(${dist})`;
-                    dist = `${dist}!==void 0&&${dist}!==null?${dist}.${search}:null`
+                    dist = `${dist}!==void 0&&${dist}!==null?${dist}.${search}:''`
                 } else {
                     dist = search;
                 }
             });
-            return context.length > 1 ? `(${dist})` : context;
+            return dist.length > 1 ? `(${dist})` : context;
         });
     }
     if (isprop) {
@@ -723,7 +723,7 @@ function renderStructure(element, scope, parentScopes = []) {
             }
             if (!element.renderid) element.renderid = -1;
             else element.renderid = -2;
-            // element.removeAttribute(name);
+            continue;
         }
         if (element.$struct) continue;
         var key = name.replace(/^(ng|v|.*?)\-|^[\:\_\.]|^v\-bind\:/i, "").toLowerCase();

package/coms/zimoli/zimoli.js

@@ -337,11 +337,17 @@ function prepare(pgpath, ok) {
     }, state);
 }
 function create(pagepath, args, from, needroles) {
-    var page_object = isObject(pagepath) ? pagepath : page_generators[getpgpath(pagepath)];
-    if (!page_object) {
-        throw new Error(`调用create前请确保prepare执行完毕:${pagepath}`);
+    if (typeof pagepath === 'string') {
+        var page_object = isObject(pagepath) ? pagepath : page_generators[getpgpath(pagepath)];
+        if (!page_object) {
+            throw new Error(`调用create前请确保prepare执行完毕:${pagepath}`);
+        }
+        var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
+    }
+    else if (isFunction(pagepath)) {
+        var pg = pagepath;
+        var { with: _with_elements, state = {}, onback: _pageback_listener, roles } = pg;
     }
-    var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
     if (!checkroles(user.roles, roles) || !checkroles(user.roles, needroles)) {
         // 检查权限
         if (!user.isLogin && user.loginPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.5.7",
+    "version": "3.5.11",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {