efront 4.4.14 → 4.5.3

package/coms/zimoli/maps.js

@@ -185,7 +185,7 @@ function maps(config = {}) {
         canvas.map.refresh();
         canvas._default = canvas.map.defaultImage();
     };
-    if (canvas.isMounted) reshape();
+    if (canvas.$mounted) reshape();
     else once("append")(canvas, reshape);
     bind('resize')(canvas, reshape);
 

package/coms/zimoli/menuList.js

@@ -296,7 +296,7 @@ function main() {
         }
         return generator(index, item);
     }, direction);
-    page.renders.unshift(function () {
+    page.$renders.unshift(function () {
         this.$scope.hasIcon = hasIcon();
     });
     page.open = function (a) {

package/coms/zimoli/model.js

@@ -46,6 +46,36 @@ unmark(checkbox);
 unmark(swap);
 unmark(image);
 unmark(success);
+var renderOption = function (o, index) {
+    if (typeof o === 'string') return o;
+    if (isFunction(o)) {
+        var name = typeof index === 'number' ? o.name : index;
+        return `<a href="javascript:;" @click=field.options[${strings.encode(index)}](data)>${name}</a>`
+    }
+    if (isObject(o)) {
+        if (o.href) {
+            return `<a href=${strings.encode(o.href)}>${o.name}</a>`;
+        }
+        return `<a href='javascript:;' @click=field.options[${strings.encode(index)}](data)>${o.name}</a>`
+    }
+    return o;
+}
+var renderOptions = function (field, data) {
+    var { options } = field;
+    if (typeof options === 'string') return options;
+    if (isFunction(options)) return renderOption(options);
+    if (options instanceof Array) {
+        return options.map(renderOption).join('');
+    }
+    else if (isObject(options)) {
+        return Object.keys(options).map(k => renderOption(options[k], k)).join('');
+    }
+    return '';
+}
+var onoff = function () {
+    var { data, field } = this;
+    data[field.key] = checker.changeValue(data[field.key]);
+};
 var constructors = {
     input,
     swap(e) {
@@ -74,10 +104,19 @@ var constructors = {
         input(ipt);
         return ipt;
     },
+    generator(elem) {
+        var { data, field } = elem;
+        elem.innerHTML = `<a @click="gen()" -if="!data[field.key]">${field.holder || '单击生成'}</a><span -else -bind="data[field.key]"></span>`;
+        render(elem, {
+            data, field, a: button, async gen() {
+                await field.options(data);
+            }
+        });
+    },
     date() {
         var elem = document.createElement("input");
         elem.type = "date";
-        elem.renders = [function () {
+        elem.$renders = [function () {
             var { data, field } = this.$scope;
             if (data && field) elem.value = parseDate(data[field.key]);
         }]
@@ -96,6 +135,11 @@ var constructors = {
         if (options) img.setAttribute("uploadto", options.uploadto);
         return img;
     },
+    checker(elem) {
+        var { data, field } = elem;
+        elem.innerHTML = `<span @click="onoff()"><checker -model=data[field.key]></checker><span -bind='field.holder'></span></span>${renderOptions(field, data)}`;
+        render(elem.children, { onoff, checker, data, a: button, field });
+    },
     checkbox({ field }) {
         var elem = checkbox();
         cast(elem, field);
@@ -132,7 +176,7 @@ var constructors = {
     },
     "repeat"(_, field_type) {
         var elem = input();
-        elem.renders = [function () {
+        elem.$renders = [function () {
             var { field, data } = this.$scope;
             var { status } = this;
             var valid = this.value === data[field_type];
@@ -157,6 +201,7 @@ var constructors = {
     }
 };
 constructors.price = constructors.money = constructors.number;
+constructors.gen = constructors.generator;
 var readonly_types = {
     "date"({ field }, data) {
         var string = data[field.key];
@@ -164,9 +209,11 @@ var readonly_types = {
     },
     "url"({ field }, data) {
         var href = data[field.key];
-        var e = anchor2(href, href);
-        e.target = "_blank";
-        return e;
+        if (href) {
+            var e = anchor2(field.holder || href, href);
+            e.target = "_blank";
+            return e;
+        }
     },
     "size"({ field }, data) {
         var f = data[field.key];
@@ -177,13 +224,18 @@ var readonly_types = {
         t.innerHTML = seek(data, a.field.key);
         return t;
     },
+    text(e) {
+        var { data, field } = e;
+        e.innerHTML = data[field.key] ?? '';
+    },
     swap(e, data) {
         var { field } = e;
         var v = data[field.key];
         if (field.options) {
             if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
             var o = field.optionsMap[v];
-            if (isObject(o)) return o.name;
+            try { e.setAttribute(field.key, v); } catch { }
+            if (isObject(o)) return `<s></s>` + o.name;
             if (isHandled(o)) return o;
         }
         if (isEmpty(v)) v = '';
@@ -191,6 +243,7 @@ var readonly_types = {
     },
 };
 readonly_types.anchor = readonly_types.url;
+readonly_types.gen = readonly_types.generator = readonly_types.text;
 var createOptionsMap = function (options) {
     if (!isObject(options[0])) return options;
     var map = Object.create(null);
@@ -293,7 +346,7 @@ function main(elem) {
                     if (!ipt.$scope) {
                         renderModel.call(ipt, field, data);
                         var saved_sataus;
-                        ipt.renders.push(function () {
+                        ipt.$renders.push(function () {
                             var { valid, status } = this;
                             if (elem.valid !== valid) elem.valid = valid;
                             if (saved_sataus === status) return;
@@ -310,7 +363,7 @@ function main(elem) {
                         on("change")(ipt, copyOptionData);
                     }
                     if ("options_from" in field) {
-                        ipt.renders.push(rebuildOptions);
+                        ipt.$renders.push(rebuildOptions);
                     }
                 }
             }

package/coms/zimoli/on.js

@@ -263,7 +263,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
             var [e, h, c] = hs[cx];
             if (h === handler && e === eventtypes && c === context) {
                 hs.splice(cx, 1);
-                if (k === changes_key) element.needchanges--;
+                if (k === changes_key) element.$needchanges--;
             }
         }
         if (!hs.length && hs.h) {
@@ -330,8 +330,8 @@ var append = function (k, hk, listener2, firstmost) {
         if (h === handler && eventtypes === e && c === context) return;
     }
     if (k === changes_key) {
-        if (!element.needchanges) element.needchanges = 0;
-        element.needchanges++;
+        if (!element.$needchanges) element.$needchanges = 0;
+        element.$needchanges++;
     }
     if (firstmost) handlers.unshift(listener2);
     else handlers.push(listener2);
@@ -342,7 +342,7 @@ var on = document.efronton = function (k) {
     if (handlersMap[on_event_path]) return handlersMap[on_event_path];
     var eventtypes = parseEventTypes(k);
     k = k.replace(eventtypereg, '');
-    var handler_path = k + "handlers";
+    var handler_path = "$h_" + k;
     var hk = handler_path + +!!eventtypes.capture;
     if (supportPassive) hk += +!!eventtypes.passive;
     if (is_addEventListener_enabled) var addhandler = function (context, handler, firstmost = false) {

package/coms/zimoli/remove.js

@@ -40,14 +40,14 @@ function hasLeaveStyle(o) {
 }
 
 function _onremove(node, event) {
-    if (!node || node.isMounted === false) return;
+    if (!node || node.$mounted === false) return;
     var children = node.childNodes;
-    if (node.isMounted) {
+    if (node.$mounted) {
         if (!event) {
             event = createEvent("remove");
         }
         dispatch(node, event);
-        node.isMounted = false;
+        node.$mounted = false;
     }
     if (children) for (var cx = 0, dx = children.length; cx < dx; cx++) {
         _onremove(children[cx], event);

package/coms/zimoli/render.js

@@ -71,7 +71,7 @@ var removeRenderElement = function () {
 function refresh(root) {
     var rest = [];
     var body = document.documentElement;
-    if (root && root.renders) {
+    if (root && root.$renders) {
         for (var k in renderElements) {
             var element = renderElements[k];
             if (
@@ -90,8 +90,8 @@ function refresh(root) {
     if (rest.length) rest.forEach(a => removeRenderElement.call(a));
 }
 function rebuild(element) {
-    if (!element.needchanges) {
-        element.renders.forEach(a => a.call(element));
+    if (!element.$needchanges) {
+        element.$renders.forEach(a => a.call(element));
         return;
     }
     var props = {};
@@ -99,7 +99,7 @@ function rebuild(element) {
         var data = element[key];
         props[key] = isObject(data) && !isFunction(data) && !isDate(data) && !isNode(data) ? extend(data instanceof Array ? [] : {}, data) : data;
     });
-    element.renders.forEach(a => a.call(element));
+    element.$renders.forEach(a => a.call(element));
     var changes = getChanges(element, props);
     if (changes) {
         var event = createEvent('changes');
@@ -118,7 +118,7 @@ var createGetter = function (target, search, isprop = true) {
 };
 var createComment = function (renders, type, expression) {
     var comment = document.createComment(`${type} ${expression}`);
-    comment.renders = renders;
+    comment.$renders = renders;
     comment.$scope = this.$scope;
     comment.$struct = this.$struct;
     comment.$parentScopes = this.$parentScopes;
@@ -294,7 +294,7 @@ var createIf = function (search, id = 0) {
     elements.comment = search;
     if (this.$struct.repeat) id = -3;
 
-    elements.renders = [function () {
+    elements.$renders = [function () {
         var shouldMount = -1;
         for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
             var getter = elements[cx + 1];
@@ -322,7 +322,7 @@ var createIf = function (search, id = 0) {
         }
 
     }];
-    return elements[0] = createComment.call(element, elements.renders, 'if', elements.comment);
+    return elements[0] = createComment.call(element, elements.$renders, 'if', elements.comment);
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     var repeater = parseRepeat(repeatExpression);
@@ -443,7 +443,7 @@ var createBinder = function (binder) {
     return function (search) {
         var getter = createGetter(this, `(${search})`);
         var oldValue;
-        this.renders.push(function () {
+        this.$renders.push(function () {
             var value = getter(this);
             if (shallowEqual(value, oldValue)) return;
             var oldv = oldValue;
@@ -465,19 +465,11 @@ var createBinder = function (binder) {
 var src2 = function (search) {
     var getter = createGetter(this, search);
     var savedValue;
-    this.renders.push(function () {
+    this.$renders.push(function () {
         var origin = getter(this);
-        var temp = origin;
-        if (origin instanceof Array) {
-            temp = extend([], origin);
-        } else if (isObject(origin)) {
-            temp = extend({}, origin);
-        } else if (!isHandled(origin)) {
-            temp = "";
-        }
+        var temp = shallowClone(origin, 1);
         if (isHandled(savedValue)) {
-            var changes = getChanges(temp, savedValue);
-            if (!changes) return;
+            if (shallowEqual(temp, savedValue, 1)) return;
         }
         else {
             if (isSame(savedValue, temp)) return;
@@ -533,16 +525,16 @@ var directives = {
             this[key] = value;
         };
         if (/^input$/i.test(target.tagName) && /^checkbox$/i.test(target.type) || /^checkbox$/i.test(target.tagName)) {
-            this.renders.push(setter || setter2.bind(target, 'checked'));
+            this.$renders.push(setter || setter2.bind(target, 'checked'));
             var change = getstr || "this.checked";
         } else if (("value" in target || target.getValue instanceof Function) && target.setValue instanceof Function) {
-            this.renders.push(setter);
+            this.$renders.push(setter);
             var change = getstr || "this.value";
         } else if (/^(select|input|textarea)$/i.test(target.tagName) || "value" in target) {
-            this.renders.push(setter || setter2.bind(target, 'value'));
+            this.$renders.push(setter || setter2.bind(target, 'value'));
             var change = getstr || "this.value";
         } else {
-            this.renders.push(setter || function () {
+            this.$renders.push(setter || function () {
                 var value = getter(this);
                 if (value === undefined) value = "";
                 if (deepEqual(oldValue, value)) return;
@@ -569,7 +561,7 @@ var directives = {
         var getter = createGetter(this, `(${search})`);
         var generatedClassNames = {};
         var oldValue;
-        this.renders.push(function () {
+        this.$renders.push(function () {
             var className = getter(this);
             if (deepEqual(oldValue, className)) return;
             oldValue = className;
@@ -608,7 +600,7 @@ var binders = {
         attr = attr.replace(/\-(\w)/g, (_, w) => w.toUpperCase());
         var getter = createGetter(this, search);
         var oldValue;
-        this.renders.push(function () {
+        this.$renders.push(function () {
             var value = getter(this);
             if (deepEqual(value, oldValue)) return;
             oldValue = value;
@@ -620,7 +612,7 @@ var binders = {
     ""(attr, search) {
         var getter = createGetter(this, search);
         var oldValue;
-        this.renders.push(function () {
+        this.$renders.push(function () {
             var value = getter(this);
             if (deepEqual(value, oldValue)) return;
             oldValue = value;
@@ -720,8 +712,8 @@ function getFromScopes(key, scope, parentScopes) {
 }
 
 function renderRest(element, struct, replacer = element) {
-    var renders = element.renders;
-    element.renders = [];
+    var renders = element.$renders;
+    element.$renders = [];
     var { binds, attrs, props } = struct;
     for (var k in binds) {
         if (k === 'src') continue;
@@ -741,7 +733,7 @@ function renderRest(element, struct, replacer = element) {
         } catch (e) { }
     }
     if (binds.src) directives.src.call(element, binds.src);
-    if (renders && renders.length) element.renders.push.apply(element.renders, renders);
+    if (renders && renders.length) element.$renders.push.apply(element.$renders, renders);
 }
 
 function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, once) {
@@ -786,7 +778,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         if (parentNode) {
             if (parentNode.$renderid > 1 || isMounted(parentNode)) element.$renderid = 2;
         }
-        element.renders = element.renders ? [].concat(element.renders) : [];
+        element.$renders = element.$renders || element.renders ? [].concat(element.$renders || [], element.renders || []) : [];
         var { copys, binds, once } = element.$struct;
         if (once) element.$renderid = 9;
         if (binds.src) {
@@ -823,8 +815,8 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     if (!isFirstRender) return element;
     renderRest(element, element.$struct, replacer);
     if (isNode(replacer) && replacer !== element) {
-        if (!replacer.renders) replacer.renders = [];
-        replacer.renders.push.apply(replacer.renders, element.renders);
+        if (!replacer.$renders) replacer.$renders = [];
+        replacer.$renders.push.apply(replacer.$renders, element.$renders);
         if (replacer.$struct && replacer.$struct !== element.$struct) {
             element.$struct.ons.forEach(([on, key, value]) => on.call(element, replacer, key, value));
         }
@@ -833,7 +825,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     else {
         element.$struct.ons.forEach(([on, key, value]) => on.call(element, element, key, value));
     }
-    if (element.renders.length) {
+    if (element.$renders.length) {
         if (element.$renderid !== 9) {
             onmounted(element, addRenderElement);
             onremove(element, removeRenderElement);

package/coms/zimoli/scrollbar.js

@@ -65,6 +65,13 @@ var scrollbary = function () {
             css(thumb, { top: targetY });
             dispatch(target, "change");
         }
+        var tt = target.target;
+        if (tt) {
+            var { Height, height } = getTargetHeight(tt);
+            var top = targetY * (Height - height) / (target.clientHeight - thumb.offsetHeight);
+            setTargetTop(tt, top);
+        }
+
     };
 
     var mouseup = function () {
@@ -141,29 +148,30 @@ var scrollbary = function () {
         return { Height, height };
     };
 
-    function bindTarget(_container, followResize = _container) {
-        var _scrollbar = this;
-        _container.with = _scrollbar;
-        _scrollbar.target = _container;
-        onmounted(_container, _scrollbar.reshape);
-        on("scroll")(_container, function () {
-            var top = getTargetTop(_container);
+    function scrollbar(elem) {
+        var onscroll = function () {
+            var top = getTargetTop(this);
             _scrollbar.scrollTo(top);
             _scrollbar.autoshow();
-        });
-        on("change")(_scrollbar, function () {
+        };
+        var onchange = function () {
             var top = _scrollbar.$Top();
-            setTargetTop(_container, top);
-        });
-        if (followResize) on("resize")(followResize, _scrollbar.reshape);
-    }
-    function scrollbar(elem) {
+            setTargetTop(this, top);
+        };
+        function bindTarget(_container, followResize = _container) {
+            _container.with = _scrollbar;
+            _scrollbar.target = _container;
+            onmounted(_container, _scrollbar.reshape);
+            on("scroll")(_container, onscroll);
+            on("change")(_scrollbar, onchange);
+            if (followResize) resizingList.set(followResize, _scrollbar.reshape);
+        }
         var _scrollbar = elem || document.createElement("scrollbar");
-        _scrollbar.reshape = function () {
+        _scrollbar.reshape = lazy(function () {
             var _container = _scrollbar.target;
             var { Height, height } = getTargetHeight(_container);
             reshape.call(_scrollbar, Height, height);
-        };
+        });
         _scrollbar.scrollTo = scrollTo;
         var _handler = document.createElement("scrollbar-thumb");
         _handler.className = "thumb";
@@ -192,16 +200,43 @@ var scrollbary = function () {
 }
 var scrollbar_y = scrollbary();
 var scrollbar_x = arriswise(scrollbary, arguments)();
-function main(direction) {
+var isBody = function (elem) {
+    return hasClass(elem, 'body') || elem.hasAttribute('body');
+}
+function main(elem) {
+    var direction, bar, target;
+    if (typeof elem === 'string') {
+        direction = elem;
+        elem = null;
+    }
+    else if (isElement(elem)) {
+        direction = elem.tagName;
+        var $struct = elem.$struct;
+        if ($struct) {
+            if ($struct.props?.target);
+            else if (isBody(elem.previousElementSibling)) {
+                target = elem.previousElementSibling;
+            }
+            else if (isBody(elem.nextElementSibling)) {
+                target = elem.nextElementSibling;
+            }
+        }
+        else if (!/^(\w*\-?)?scroll/i.test(direction)) target = elem, elem = null;
+    }
+    else {
+        elem = null;
+    }
     var bar, target;
     if (isElement(direction)) {
         target = direction;
         direction = target.tagName;
     }
     if (/^[xh]/i.test(direction)) {
-        bar = scrollbar_x();
+        bar = scrollbar_x(elem);
+        bar.setAttribute('x', '');
     } else {
-        bar = scrollbar_y();
+        bar = scrollbar_y(elem);
+        bar.setAttribute('y', '');
     }
     if (target) bar.bindTarget(target);
     return bar;

package/coms/zimoli/scrollbar.less

@@ -1,12 +1,24 @@
 & {
     position: absolute;
     width: 6px;
-    background-color: rgba(0, 0, 0, .1);
     border-radius: 7px;
     height: 100px;
     border-left: 3px solid transparent;
 
-    &:hover {
+    &[x],
+    &.x {
+        left: 0;
+        bottom: 0;
+    }
+
+    &[y],
+    &.y {
+        top: 0;
+        right: 0;
+    }
+
+    &:hover,
+    &:active {
         >.thumb {
             opacity: 1 !important;
             overflow: visible;

package/coms/zimoli/scrollbar_test.less

@@ -1,4 +1,5 @@
 & {
+    background-color: rgba(0, 0, 0, .1);
     >div {
         @mask-color: #ccc;
         width: 200px;

package/coms/zimoli/select.js

@@ -219,10 +219,10 @@ function select(target, list, removeOnSelect, direction) {
         }
         else _remove();
     };
-    if (!target.renders) {
-        target.renders = [];
+    if (!target.$renders) {
+        target.$renders = [];
     }
-    target.renders.push(setIcon);
+    target.$renders.push(setIcon);
     onclick(target, mousedown);
     return target;
 }

package/coms/zimoli/table.js

@@ -506,7 +506,7 @@ function table(elem) {
             },
             thead(t) {
                 var tr = document.createElement('thead');
-                tr.renders = [function () {
+                tr.$renders = [function () {
                     resizeT(this.firstChild)
                 }];
                 css(tr, { display: 'block' });

package/coms/zimoli/toBase64.js

@@ -1,14 +1,24 @@
 var encoding = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
-function toBase64(input) {
+function toBase64(input, url) {
+    var encoding1 = encoding;
+    if (url) {
+        encoding1[62] = "-";
+        encoding1[63] = "_";
+    }
     for (var cx = 0, block, output = [], dx = input.length; cx < dx;) {
         block = input[cx++] << 16 | input[cx++] << 8 | input[cx++];
         output.push(
-            encoding[block >> 18],
-            encoding[block >> 12 & 0b111111],
-            encoding[block >> 6 & 0b111111],
-            encoding[block & 0b111111]
+            encoding1[block >> 18],
+            encoding1[block >> 12 & 0b111111],
+            encoding1[block >> 6 & 0b111111],
+            encoding1[block & 0b111111]
         );
     }
-    for (cx = output.length + dx - cx, dx = output.length; cx < dx; cx++) output[cx] = '=';
+    if (url) {
+        encoding1[62] = "+";
+        encoding1[63] = "/";
+        while (cx-- > dx) output.pop();
+    }
+    else for (cx = output.length + dx - cx, dx = output.length; cx < dx; cx++) output[cx] = '=';
     return output.join("");
 }

package/coms/zimoli/view.js

@@ -103,12 +103,12 @@ var resize2 = function () {
         else if (isType(c, "foot")) foot = c;
     }
     if (head && body) {
-        var height = head.offsetHeight;
+        var height = head.offsetHeight + head.offsetTop;
         css(head, {
             marginBottom: fromOffset(-height),
         })
         css(body, {
-            paddingTop: fromOffset(height)
+            paddingTop: fromOffset(height - body.clientTop)
         });
     }
     if (foot && body) {
@@ -120,22 +120,32 @@ var resize2 = function () {
             marginTop: fromOffset(-height)
         })
     }
+    if (body) {
+        if (body.scrollHeight + body.offsetTop > this.clientHeight) {
+            css(body, { height: fromOffset(this.clientHeight) });
+        }
+        else {
+            css(body, { height: '' });
+        }
+    }
 };
 function view(element) {
-    var window = isNode(element) ? element : document.createElement("form");
+    var w = isNode(element) ? element : document.createElement("form");
     init();
-    extend(window, prototype);
-    if (window !== element) {
-        extend(window, element);
-        once("append")(window, function () {
-            if (window.draggable !== true && window.draggable !== false) {
-                window.draggable = /^(fixed|absolute)$/i.test(getComputedStyle(window).position);
+    extend(w, prototype);
+    if (w !== element) {
+        extend(w, element);
+        once("append")(w, function () {
+            if (w.draggable !== true && w.draggable !== false) {
+                w.draggable = /^(fixed|absolute)$/i.test(getComputedStyle(w).position);
             }
-            if (window.draggable) window.setAttribute('draggable', 'draggable');
+            if (w.draggable) w.setAttribute('draggable', 'draggable');
         })
-        if (window.resizable) resize.on(window);
+        if (w.resizable) resize.on(w);
     }
-    on('resize')(window, resize2);
-    onmounted(window, resize2);
-    return window;
+    resizingList.set(w, resize2);
+    w.renders = [resize2];
+    w.reshape = lazy(resize2);
+    onmounted(w, w.reshape);
+    return w;
 }