efront 3.25.14 → 3.25.16

package/coms/basic/loader.js

@@ -22,7 +22,8 @@ var {
     console,
     efrontURI,
     parseFloat,
-    PREVENT_FRAMEWORK_MODE,
+    preventFrame,
+    PREVENT_FRAMEWORK_MODE = preventFrame,
     devicePixelRatio = 1,
     startPath: efrontPath,
     pixelDecoder // = d => d / 16 + "rem"

package/coms/zimoli/LoadingArray.js

@@ -14,8 +14,6 @@
 // }
 function LoadingArray() {
     var this0 = [];
-    this0.totalCount = 0;
-    this0.data = [];
     this0.is_errored = null;
     this0.error_message = null;
     this0.is_loading = true;

package/coms/zimoli/model.js

@@ -35,7 +35,13 @@ var renderModel = function (field, data) {
         data
     });
 };
+var unmark = function (select) {
+    select.isediter = false;
+    select.isreader = false;
+};
+unmark(select);
 var constructors = {
+    input,
     swap(e) {
         var { field } = e;
         e = swap(e);
@@ -186,6 +192,24 @@ var createOptionsMap = function (options) {
     return map;
 }
 readonly_types.select = readonly_types.swap;
+var findReaderForElement = function (type, e) {
+    var editor = render.getFromScopes(type, e.$scope, e.$parentScopes);
+    if (isFunction(editor) && (editor.isreader || !editor.isediter) && editor.isreader !== false) return editor;
+};
+var findEditerForElement = function (type, e) {
+    var editor = render.getFromScopes(type, e.$scope, e.$parentScopes);
+    if (isFunction(editor) && (editor.isediter || !editor.isreader) && editor.isediter !== false) return editor;
+};
+var markReader = function (readers) {
+    for (var k in readers) {
+        readers[k].isreader = true;
+    }
+};
+var markEditer = function (editers) {
+    for (var k in editers) {
+        editers[k].isediter = true;
+    }
+};
 function main(elem) {
     var build = function () {
         var { data, readonly, field } = elem;
@@ -214,7 +238,7 @@ function main(elem) {
                 if (field_type === "function") {
                     field_editor(elem);
                 } else {
-                    var create = readonly_types[field_type];
+                    var create = findReaderForElement(field_type, elem) || readonly_types[field_type];
                     if (create) {
                         var e = create(elem, data, field_ref);
                         if (isNode(e)) {
@@ -249,7 +273,8 @@ function main(elem) {
                     });
                 }
             } else {
-                var create = field_type === "function" ? field_editor : constructors[field_type];
+                var create = field_type === "function" ? field_editor : findEditerForElement(field_type, elem) || constructors[field_type];
+                console.log(create === constructors.select)
                 var ipt = create ? create(elem, field_ref) : field.key ? input(function () {
                     var input = document.createElement('input');
                     input.setAttribute('type', field.type);
@@ -298,23 +323,28 @@ function main(elem) {
     });
     return elem;
 }
-
+markEditer(constructors);
+markReader(readonly_types);
 extend(main, {
     setEditors(map) {
         extend(constructors, map);
+        markEditer(map);
     },
     setReadors(map) {
         extend(readonly_types, map);
+        markReader(map);
     },
-    setModels(key, map) {
-        this.setEditors(key, map);
-        this.setReadors(key, map);
+    setModels(map) {
+        this.setEditors(map);
+        this.setReadors(map);
     },
     setEditor(key, func) {
         constructors[key] = func;
+        func.isediter = true;
     },
     setReador(key, func) {
         readonly_types[key] = func;
+        func.isreader = true;
     },
     setModel(key, func) {
         this.setEditor(key, func);

package/coms/zimoli/render.js

@@ -901,6 +901,4 @@ render.register = function (key, name) {
         register(key, name);
     }
 };
-render.style = function (element, search) {
-    return directives.style.call(element, search);
-}
+render.getFromScopes = getFromScopes;

package/coms/zimoli/table.js

@@ -300,6 +300,17 @@ var setClass = function (tds, cls, old) {
     old.forEach(td => { if (!td[cls]) removeClass(td, cls) });
     tds.forEach(td => { addClass(td, cls); delete td[cls] });
 };
+var removeYIng = function (activeCols) {
+    activeCols.forEach(function (td) {
+        removeClass(td, 'y-ing');
+    });
+};
+var removeXIng = function (activeRows) {
+    activeRows.forEach(function (td) {
+        removeClass(td, 'x-ing');
+    });
+};
+
 var getTdsOfSameRow = function (td) {
     var tds = [td];
     var tmp = td;
@@ -337,6 +348,7 @@ var getTdsOfSameRow = function (td) {
     }
     return tds;
 };
+
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
@@ -357,30 +369,24 @@ function table(elem) {
             var td = getTargetIn(tr, event.target, false);
             if (!td) break a;
             var tds = getTdsOfSameRow(td);
+            removeYIng(activeCols);
             setClass(tds, 'x-ing', activeRows);
             activeRows = tds;
+            return;
         }
         if (!thead) {
             thead = getThead(table);
         }
-        if (!getTargetIn(thead, event.target)) {
-            activeCols.forEach(function (td) {
-                removeClass(td, 'y-ing');
-            });
-            return;
-        }
+        if (!getTargetIn(thead, event.target)) return;
         var tds = getTargetIn(cellMatchManager, event.target);
         if (!tds) return;
         setClass(tds, 'y-ing', activeCols);
+        removeXIng(activeRows);
         activeCols = tds;
     });
     onmouseleave(tableElement, function () {
-        activeCols.forEach(function (td) {
-            removeClass(td, "y-ing");
-        });
-        activeRows.forEach(function (td) {
-            removeClass(td, 'x-ing');
-        });
+        removeYIng(activeCols);
+        removeXIng(activeRows);
     });
     var table = tableElement;
     var thead;

package/coms/zimoli/vbox.js

@@ -207,7 +207,7 @@ var xbox = arriswise(ybox, [].concat(allArgumentsNames, [].slice.call(arguments,
  */
 function vbox(generator, $Y) {
     if ($Y !== false && $Y !== true) {
-        if (!$Y) {
+        if (!isString($Y)) {
             if (isElement(generator)) {
                 if (generator.hasAttribute('x-box') || generator.hasAttribute('xbox') || /^[xh]/i.test(generator.getAttribute('type') || /^[hx]/i.test(generator.getAttribute('mode')))) {
                     $Y = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.25.14",
+    "version": "3.25.16",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {