efront 4.3.3 → 4.3.5

package/coms/zimoli/grid.js

@@ -547,9 +547,9 @@ var grid_prototype = {
             } else {
                 var _div = point.target;
                 if (!_div) {
-                    point.target = _div = document.createElement('cell');
+                    // point.target = _div = document.createElement('cell');
                 }
-                if (_div.parentNode !== grid) appendChild(grid, _div);
+                if (_div && _div.parentNode !== grid) appendChild(grid, _div);
                 var current_value;
                 if (current_d === "x") {
                     if (next_point) {
@@ -563,15 +563,17 @@ var grid_prototype = {
                     point.top = current_t;
                     point.bottom = current_b;
                     if (point.origin !== point.value || current_t && current_t.origin !== current_t.value) {
-                        if (getComputedStyle(_div).position === 'absolute') {
-                            css(_div, {
-                                left: point.value / grid.width * 100 + "%",
-                                top: current_t ? current_t.value / grid.height * 100 + "%" : 0,
-                                width: current_value / grid.width * 100 + "%",
-                                height: (current_h / grid.height || 0) * 100 + "%"
-                            });
-                        } else {
-                            setRelativeDiv(_div, current_value, current_h, point.value, current_t ? current_t.value : 0);
+                        if (_div) {
+                            if (getComputedStyle(_div).position === 'absolute') {
+                                css(_div, {
+                                    left: point.value / grid.width * 100 + "%",
+                                    top: current_t ? current_t.value / grid.height * 100 + "%" : 0,
+                                    width: current_value / grid.width * 100 + "%",
+                                    height: (current_h / grid.height || 0) * 100 + "%"
+                                });
+                            } else {
+                                setRelativeDiv(_div, current_value, current_h, point.value, current_t ? current_t.value : 0);
+                            }
                         }
                         point.width = current_value / grid.width;
                         point.height = current_h / grid.height;
@@ -588,15 +590,17 @@ var grid_prototype = {
                     point.left = current_l;
                     point.right = current_r;
                     if (point.origin !== point.value || current_l && current_l.origin !== current_l.value) {
-                        if (getComputedStyle(_div).position === 'absolute') {
-                            css(_div, {
-                                left: current_l ? current_l.value / grid.width * 100 + "%" : 0,
-                                top: point.value / grid.height * 100 + "%",
-                                width: (current_w / grid.width || 0) * 100 + "%",
-                                height: current_value / grid.height * 100 + "%"
-                            });
-                        } else {
-                            setRelativeDiv(_div, current_w, current_value, current_l ? current_l.value : 0, point.value);
+                        if (_div) {
+                            if (getComputedStyle(_div).position === 'absolute') {
+                                css(_div, {
+                                    left: current_l ? current_l.value / grid.width * 100 + "%" : 0,
+                                    top: point.value / grid.height * 100 + "%",
+                                    width: (current_w / grid.width || 0) * 100 + "%",
+                                    height: current_value / grid.height * 100 + "%"
+                                });
+                            } else {
+                                setRelativeDiv(_div, current_w, current_value, current_l ? current_l.value : 0, point.value);
+                            }
                         }
                         point.width = current_w / grid.width;
                         point.height = current_value / grid.height;
@@ -733,7 +737,14 @@ var createBoundsFromComputed = function (grid) {
 };
 var createPointsWithChildren = function () {
     var grid = this;
-    if (!grid.children.length) return;
+    var children = [];
+    for (var c of grid.children) {
+        var s = getComputedStyle(c);
+        if (s.display === 'none' || /^(fixed|absolute)$/i.test(s.position)) continue;
+        children.push(c);
+    }
+    if (children.length < 2 || grid.adapted) return;
+    grid.adapted = true;
     var getRange = function (e) {
         var range = [0, 0, Infinity, Infinity];
         var computed = getComputedStyle(e);
@@ -747,7 +758,7 @@ var createPointsWithChildren = function () {
         range[3] = Math.floor(range[3]);
         return range;
     };
-    var elements = Array.apply(null, grid.children).map(a => [a,
+    var elements = children.map(a => [a,
         +Math.max(0, a.offsetLeft * grid.width / grid.clientWidth).toFixed(0),
         +(Math.min(a.offsetLeft + a.offsetWidth, grid.clientWidth) * grid.width / grid.clientWidth).toFixed(0),
         +Math.max(0, a.offsetTop * grid.height / grid.clientHeight).toFixed(0),
@@ -764,6 +775,7 @@ var createPointsWithChildren = function () {
 function main(elem) {
     if (isElement(elem)) {
         elem = grid.call(elem);
+        elem.adapt = createPointsWithChildren;
         care(elem, elem.setData);
         care(elem, elem.reshape);
     } else {

package/coms/zimoli/menu.less

@@ -154,7 +154,12 @@ body:active & {
         padding-bottom: 6px;
         line-height: 20px;
         font-size: 14px;
-
+        border-radius: 0;
+/*
+狗物业弄了电子门禁还嫌不够，连人行道也弄个一人一杆。
+住在这里就像住在监狱，随时都可能被限制人身自由。
+狗日的共产党还和狗物业尿到一个壶里。
+*/
         >b {
             font-weight: normal;
         }

package/coms/zimoli/model.js

@@ -182,7 +182,8 @@ var readonly_types = {
         if (field.options) {
             if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
             var o = field.optionsMap[v];
-            if (o) return o.name;
+            if (isObject(o)) return o.name;
+            if (isHandled(o)) return o;
         }
         if (isEmpty(v)) v = '';
         return v;
@@ -190,13 +191,15 @@ var readonly_types = {
 };
 readonly_types.anchor = readonly_types.url;
 var createOptionsMap = function (options) {
+    if (!isObject(options[0])) return options;
     var map = Object.create(null);
     for (var o of options) {
-        map[o.key] = o;
+        if (isHandled(o.key)) map[o.key] = o;
+        else if (isHandled(o.value)) map[o.value] = o;
     }
     return map;
 }
-readonly_types.select = readonly_types.swap;
+readonly_types.radio = 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;

package/coms/zimoli/on.js

@@ -498,6 +498,16 @@ var invoke = function (event, type, pointerType) {
             touchendFired = true;
             invoke(event, 'click');
         }, true);
+        var lasttime_dblclick = true;
+        window.addEventListener("dblclick", function (event) {
+            var saved_time = lasttime_dblclick;
+            lasttime_dblclick = event.timeStamp;
+            if (lasttime_dblclick - saved_time < 300) {
+                event.preventDefault();
+                event.stopPropagation();
+                return;
+            }
+        }, true);
         window.addEventListener("click", function (event) {
             if (!isClickWithPointer) return;
             var need = needFireClick;
@@ -511,6 +521,9 @@ var invoke = function (event, type, pointerType) {
                 event.stopPropagation();
                 return;
             }
+            if (lasttime_click - saved_time < 300) {
+                invoke(event, 'dblclick');
+            }
         }, true);
     }
 

package/docs/main.xht

@@ -42,11 +42,14 @@
         content: "样";
     }
 
-    :root>menu {
+    :root>menu[inline] {
+        height: 100%;
+    }
+
+    :root>menu[inline] {
         margin: 0;
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);
-        height: 100%;
         display: inline-block;
         min-width: 200px;
         max-width: 600px;
@@ -84,11 +87,80 @@
         color: #79a;
         margin-left: 12px;
     }
+
+    open {
+        display: none;
+    }
+
+    @media screen and (max-width:599px) {
+        form {
+            width: 100% !important;
+            height: 100% !important;
+            z-index: 0 !important;
+        }
+
+        :root>open:after {
+            content: "≡";
+        }
+
+        :root>open {
+
+            display: block;
+            position: absolute;
+            height: 42px;
+            width: 42px;
+            line-height: 42px;
+            text-align: center;
+            color: #fff;
+            background: #1e282c;
+            font-family: 'Times New Roman', Times, serif;
+            font-size: 26px;
+            z-index: 2147483647 !important;
+            right: 20px;
+            bottom: 20px;
+            border-radius: 50%;
+        }
+
+        :root>menu {
+
+            position: absolute;
+            z-index: -1;
+
+            &[open] {
+                left: 0 !important;
+                right: 0 !important;
+                top: 0 !important;
+                bottom: 0 !important;
+                width: 100% !important;
+                height: 100% !important;
+                margin: 0 !important;
+                z-index: 3;
+
+                ~open {
+                    background-color: #fff;
+                    color: #1e282c;
+
+                    &:after {
+                        content: "⨉";
+                        vertical-align: top;
+                        font-size: 18px;
+                    }
+                }
+            }
+
+        }
+
+        :root {
+            padding: 0px !important;
+        }
+    }
 </style>
-<menu #mulu inline -src="m in menus" @active="openMenu(m)">
+
+<menu #mulu open@="menued" inline -src="m in menus" @active="openMenu(m)">
     <div2></div2>
 </menu>
 <div1 #content></div1>
+<open #switch @click="switchMenu()" insert></open>
 <script>
     var menus = [
         {
@@ -130,12 +202,12 @@
                 }
             }
         ]);
-    })
+    });
     var initVersionInfo = async function () {
         var xhr = await cross("get", "version");
         var version = xhr.response.split(",");
         menus[0].name += ` <v>${version[0]}</v>`;
-    }
+    };
     var initCommandsDocs = async function () {
         var helps = await init("docs$helps");
         var m = {
@@ -204,7 +276,7 @@
         scope.menus = route.update(menus);
         zimoli();
         render.refresh();
-    }
+    };
     var scope = {
         menus,
         div2(elem, scope) {
@@ -214,11 +286,17 @@
         },
         grid,
         menu,
+        menued: false,
+        switchMenu() {
+            scope.menued = !scope.menued;
+        },
         openMenu(m) {
             this.menus.open(m);
+            if (!m.children) this.menued = false;
         }
     };
     var page = document.createElement('grid');
+    page.adapted = screen.width < 720 && -1;
     page.innerHTML = template;
     if (window.require) {
         var title = document.createElement('titlebar');
@@ -239,11 +317,23 @@
     on("mounted")(page, initMenus);
     s.bindTarget(scope.content);
     page.with = s;
+    resizingList.set(page, function () {
+        if (page.adapted === true) return;
+        if (calcPixel(page.offsetWidth) < 720) return;
+        page.adapted = false;
+        page.adapt();
+    });
     bind("render")(page, function () {
         requestAnimationFrame(function () {
             s.reshape();
         })
     });
+    drag.on(scope.switch);
+    css(scope.switch, data.getInstance('switch-position'));
+    on('dragend')(scope.switch, function () {
+        var s = this.style;
+        data.setInstance('switch-position', { left: s.left, top: s.top, marginLeft: s.marginLeft, marginTop: s.marginTop }, true);
+    })
     function main() {
         return page;
     }

package/docs/mark.xht

@@ -1,18 +1,19 @@
 <style>
-    :scope {
-        line-height: 1.8;
-        display: block;
-        font-family: Times, "宋体", sans-serif;
-
-        @media screen and (max-width:830px) {
+    @media screen and (max-width: 830px) {
+        :scope {
             padding: 20px 40px;
         }
+    }
 
-        @media screen and (min-width:1160px) {
+    @media screen and (min-width: 1160px) {
+        :scope {
             margin: 20px auto;
         }
+    }
+
+    @media screen and (min-width: 830px) {
+        :scope {
 
-        @media screen and (min-width:830px) {
             max-width: 890px;
             border: 1px solid #000;
             padding: 60px 80px;
@@ -20,6 +21,12 @@
         }
     }
 
+    :scope {
+        line-height: 1.8;
+        display: block;
+        font-family: Times, "宋体", sans-serif;
+    }
+
     code {
         width: 100%;
     }

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -89,7 +89,7 @@
             fields: [
                 { name: i18n`提示`, readonly: true, key: 'apply_info', type: 'text' },
                 { name: i18n`appid及密钥申请地址`, readonly: true, key: 'apply_url', type: 'anchor' },
-                { name: i18n`appid`, key: 'appid', type: 'input' },
+                { name: `appid`, key: 'appid', type: 'input' },
                 { name: i18n`密钥`, key: 'sign', type: "input" },
                 { name: i18n`目标语言`, type: 'checkbox', options: supports }
             ], data: {

package/package.json

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