efront 4.15.3 → 4.17.0

package/coms/compile/translate.js

@@ -2,11 +2,11 @@ var scanner2 = require("./scanner2");
 var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, patchArrawScope, number_reg, replace, canbeDuplicate, createString } = require("./common");
 var strings = require("../basic/strings");
 var program = null;
-var patchTranslate = function (c) {
+var patchTranslate = function (c, raw) {
     if (c.length) {
         var canbeDup = true;
         c.translate = c.map((o, i) => {
-            if (o.type === PIECE) return strings.decode(`\`${o.text}\``);
+            if (o.type === PIECE) return raw ? o.text : strings.decode(`\`${o.text}\``);
             if (canbeDup && !canbeDuplicate(o)) canbeDup = false;
             return `$${i + 1 >> 1}`;
         }).join('').replace(/\r\n|\r|\n/g, '\r\n');
@@ -14,7 +14,7 @@ var patchTranslate = function (c) {
     }
     else {
         if (/^['"`]/.test(c.text) && c.text.length > 2) {
-            var text = strings.decode(c.text).replace(/\r\n|\r|\n/g, '\r\n');
+            var text = raw ? c.text.slice(1, c.text.length - 1) : strings.decode(c.text).replace(/\r\n|\r|\n/g, '\r\n');
             c.translate = text;
         }
     }
@@ -54,7 +54,7 @@ function getI18nPrefixedText(code, dist = []) {
             if (!n || n.type !== QUOTED || n.length && n.entry !== '`') continue;
             var c = n;
             c.transtype = t;
-            patchTranslate(c);
+            patchTranslate(c, t === 字段名);
             f(c);
         }
     };

package/coms/compile/unstruct.js

@@ -590,7 +590,7 @@ var _invoke = function (t, getname) {
                         if (q0f?.type === STRAP && !q0f.transive) remove_end_comma(queue[queue.length - 1]);
                     }
                     var qe = q[q.length - 1];
-                    splice(o, by, ey - by, ...qe ? cloneNode(qe.name) : []);
+                    splice(o, by, ey - by, ...qe?.name ? cloneNode(qe.name) : []);
                     cy = by + 1;
                 }
                 else {
@@ -1206,7 +1206,6 @@ function toqueue(body, getname, ret = false, result = []) {
             else if (ei >= 0) break;
             _poplabel();
         }
-
         if (o.type === LABEL) {
             o.scope = scopes[scopes.length - 1];
             o.final = body.indexOf(skipSentenceQueue(o.next), cx);
@@ -1231,6 +1230,10 @@ function toqueue(body, getname, ret = false, result = []) {
             if (/^(new|typeof|delete|await|void|debugger)$/.test(o.text)) {
                 break a;
             }
+            if (/^(var|let|const)$/i.test(o.text)) {
+                bx = ++cx;
+                continue;
+            }
             if (brk("yield", YIELD, skipAssignment)) break a;
             if (brk("return", RETURN, skipSentenceQueue)) break a;
             if (brk("throw", THROW, skipSentenceQueue)) break a;
@@ -1340,7 +1343,13 @@ function toqueue(body, getname, ret = false, result = []) {
                 }
             }
             else {
-                cx++;
+                cx = skipAssignment(body, cx);
+                if (cx > bx) {
+                    var b = body.slice(bx, cx);
+                    var bs = ternary(b, getname, ret);
+                    for (var b of bs) pushstep(result, b);
+                }
+                else cx++;
             }
             bx = cx;
             continue;

package/coms/compile/unstruct_test.js

@@ -159,4 +159,6 @@ r++// test("if(a)else {}",'')
 test("if(a){if(b){c}d}else{e}", `if (!a) return [2, 0]; if (!b) return [1, 0]; c; return [1, 0];\r\n d; return [2, 0];\r\n e; return [1, 0]`)
 test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1, 0]; c; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n e; return [1, 0]`)
 test("if(a&&b||c){d}", `_ = a; if (!_) return [1, 0]; _ = b;\r\n if (_) return [1, 0]; _ = c;\r\n if (!_) return [1, 0]; d; return [1, 0]`, true);
-test("if(a)switch(b){case c:d;break;} else{h}", `if (!a) return [3, 0]; if (b === c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n h; return [1, 0]`)
+test("if(a)switch(b){case c:d;break;} else{h}", `if (!a) return [3, 0]; if (b === c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n h; return [1, 0]`)
+test("var res = null, krc;", `res = null; krc`)
+test("res = null, krc;", `res = null; krc`)

package/coms/compile//347/264/240/351/246/250.js

@@ -497,6 +497,7 @@ var killneg = function (v, n) {
             v = n + v;
         }
     }
+    else if (n) v = n + v;
     return v;
 };
 var calcvars = function (v) {

package/coms/compile//347/264/240/351/246/250_test.js

@@ -87,6 +87,7 @@ assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
 assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
 assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
 assert(素馨(`@a:-1;b{a:-@a}`, '', true), `b{a:1;}`);
+assert(素馨(`--mwidth:0px;--bwidth:2px;--qwidth: var(--mwidth)+var(--bwidth);width:--qwidth`, '', true), `width:2px;`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/zimoli/checker.less

@@ -3,7 +3,7 @@
     width: .8em;
     position: relative;
     border: .1em solid;
-    margin: -0.2em .3em -0.2em 0;
+    margin: -0.2em .3em -0.1em 0;
     font-family: sans-serif;
     display: inline-block;
     line-height: 1;

package/coms/zimoli/css.js

@@ -11,7 +11,8 @@ var stylePrefix = function (documentStyle) {
     if ("-o-transform" in documentStyle) return "-o-";
     return "";
 }(documentStyle);
-var ratioPropReg = /(?:opacity|line\-height|lineHeight|z\-index|zIndex|zoom|weight|count|order|perspective|animation|flex|font\-size\-adjust|tab\-size|scale|grid\-(?:column|row)(?:\-(?:start|end))?)$/i;
+var ratioPropReg = /(?:opacity|lineHeight|zIndex|zoom|weight|count|order|perspective|animation|flex|fontSizeAdjust|tabSize|scale|grid(?:Column|Row)(?:Start|End)?)$/i;
+var urlwrapReg = /(?:backgroundImage|borderImageSource)/;
 var nodePrefix = stylePrefix.slice(1, stylePrefix.length - 1);
 var transfromSimpleValue = function (value) {
     if (isFinite(value)) return fromOffset(+value || 0);
@@ -24,7 +25,13 @@ var transformValue = function (value, k) {
         return res;
     }
     if (ratioPropReg.test(k) || !value) return value;
-    if (/^[\w\s\.]+$/.test(value)) return isFinite(value) ? transfromSimpleValue(value) : String(value).split(/\s+/).map(transfromSimpleValue).join(' ');
+    if (urlwrapReg.test(k)) {
+        if (!/^[\w\-]+\(/.test(value)) {
+            value = `url('${value}')`;
+        }
+        return value;
+    }
+    if (/^[\-\w\s\.]+$/.test(value)) return isFinite(value) ? transfromSimpleValue(value) : String(value).split(/\s+/).map(transfromSimpleValue).join(' ');
     return value;
 };
 var setValue = function (o, k, v) {

package/coms/zimoli/getTypedChildren.js

@@ -7,12 +7,16 @@ function hasType(target, type) {
 return function (element, types) {
     var marked = 0;
     for (var k in types) {
+        var mark0 = marked;
         for (var c of element.children) {
             if (hasType(c, types[k])) {
                 types[k] = c;
                 marked++;
             }
         }
+        if (marked === mark0) {
+            types[k] = null;
+        }
     }
     if (!marked && isArray(types)) {
         var children = element.children;

package/coms/zimoli/input.js

@@ -134,6 +134,7 @@ function input(element) {
                 case "integer":
                 case "number":
                 case "num":
+                case "digit":
                     on("keydown")(element, number);
                     break;
                 default:

package/coms/zimoli/input.less

@@ -10,6 +10,8 @@
     border-radius: 3px;
     font-size: 16px;
     -webkit-appearance: none;
+    appearance: none;
+    -moz-appearance: textfield;
     box-shadow: none;
     outline: none;
 
@@ -22,11 +24,13 @@
     display: none;
 }
 
+&::-moz-focus-inner,
 &::-webkit-inner-spin-button {
     display: none;
 }
 
-&::-webkit-inner-spin-button {
+&::-moz-focus-outer,
+&::-webkit-outer-spin-button {
     display: none;
 }
 

package/coms/zimoli/list.js

@@ -431,6 +431,7 @@ function ylist(container, generator, $Y) {
         var elem = getLastElement(2);
         var listRestHeight = elem ? elem.offsetHeight + elem.offsetTop - list.scrollTop : list.clientHeight;
         var paddingHeight = elem ? 0 : restHeight;
+        if (listRestHeight < list.clientHeight) listRestHeight = list.clientHeight;
         return currentY() + listRestHeight + paddingHeight;
     };
     list.$Top = function (y) {

package/coms/zimoli/menuList.less

@@ -6,6 +6,7 @@
     border: 1px solid #0003;
     padding: 6px 0;
     outline: none;
+    background: #fff;
 
     >menu-item {
         display: block;

package/coms/zimoli/model.js

@@ -100,7 +100,7 @@ var constructors = {
     text: textarea,
     number(e) {
         var { data, field } = e;
-        var content = `<input type=${field.type} -model=data[field.key] />` + (field.unit ? `<span>${field.unit}</span>` : '');
+        var content = `<input placeholder="${field.holder || i18n`输入${field.name}`}" type=${field.type} -model=data[field.key] />` + (field.unit ? `<span>${field.unit}</span>` : '');
         e.innerHTML = content;
         if (field.unit && field.unit.length <= 6) {
             e.setAttribute("u" + field.unit.replace(/[\u0080-\ud7ff\uf000-\uffff]/g, '11').length, '')
@@ -118,7 +118,7 @@ var constructors = {
     },
     date(m) {
         var { data, field } = m;
-        m.innerHTML = `<input placeholder=${field.holder || '选择日期'} readonly -model=data[field.key] />`;
+        m.innerHTML = `<input placeholder=${field.holder || i18n`选择日期`} readonly -model=data[field.key] />`;
         render(m, {
             data, field, input,
         });
@@ -126,7 +126,7 @@ var constructors = {
     },
     datetime(m) {
         var { data, field } = m;
-        m.innerHTML = `<input placeholder=${field.holder || '选择日期和时间'} readonly -model=data[field.key] />`;
+        m.innerHTML = `<input placeholder=${field.holder || i18n`选择日期和时间`} readonly -model=data[field.key] />`;
         render(m, {
             data, field, input,
         });
@@ -154,15 +154,27 @@ var constructors = {
         cast(elem, field);
         return elem;
     },
-    radio({ field }) {
+    radio({ data, field }) {
         var elem = radio();
+        elem.value = data[field.key];
         cast(elem, field);
         return elem;
     },
     select(_, t) {
         if (!t) {
             var elem = select();
-            elem.innerHTML = `<option ng-repeat="(o,i) in field.options" ng-bind="o.name||o" _value="o.key!==undefined?o.key:o"></option>`;
+            var { field, data } = _;
+            elem.value = data[field.key];
+            var o = field.options?.[0];
+            if (field.holder) _.innerHTML = `<span -if="isEmpty(data[field.key])" class="placeholder">${field.holder}</span>`;
+            if (!isEmpty(o?.key)) {
+                field.options.unshift({
+                    name: i18n`选择${field.name}`,
+                    key: ''
+                })
+            }
+            render(_.children, { field, data, isEmpty });
+            elem.innerHTML = `<option -repeat="(o,i) in field.options" ng-bind="o.name||o" _value="o.key!==undefined?o.key:o"></option>`;
         }
         else if (t === 'a') {
             var { field, data } = _;
@@ -365,7 +377,7 @@ function main(elem) {
                     return input;
                 }()) : null;
                 if (ipt) {
-                    if (ipt !== elem) appendChild(elem, ipt);
+                    if (ipt !== elem) appendChild.insert(elem, ipt);
                     if (!ipt.$scope) {
                         renderModel.call(ipt, field, data);
                         var saved_sataus;

package/coms/zimoli/model.less

@@ -3,6 +3,35 @@
     display: inline-block;
 }
 
+&[type=select] {
+    position: relative;
+
+    >.select:hover,
+    >.select:active {
+        &+.placeholder {
+            color: #fff9;
+        }
+    }
+
+    .placeholder {
+        color: #0009;
+        padding-left: 6px;
+        position: absolute;
+        top: 50%;
+        margin-top: -.5em;
+        line-height: 1;
+        margin-bottom: -1em;
+        z-index: 1;
+        pointer-events: none;
+        display: block;
+    }
+
+    .select[empty] {
+        color: transparent;
+    }
+
+}
+
 &[type=date] {
     >input {
         width: 8em;
@@ -21,7 +50,12 @@
     }
 }
 
-&[type=int] {
+&[type=int],
+&[type=number],
+&[type=digit],
+&[type=money],
+&[type=price],
+&[type=num] {
     >input {
         text-align: right;
         width: 8em;

package/coms/zimoli/on.js

@@ -269,7 +269,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
     if (hs) {
         for (var cx = hs.length - 1; cx >= 0; cx--) {
             var [e, h, c] = hs[cx];
-            if (h === handler && e === eventtypes && c === context) {
+            if (h === handler && shallowEqual(e, eventtypes, 2) && c === context) {
                 hs.splice(cx, 1);
                 if (k === changes_key) element.$needchanges--;
             }
@@ -333,8 +333,8 @@ var append = function (k, hk, listener2, firstmost) {
     var [eventtypes, handler, context] = listener2;
     var element = this;
     var handlers = element[hk];
-    for (var [h, e, c] of handlers) {
-        if (h === handler && eventtypes === e && c === context) return;
+    for (var [e, h, c] of handlers) {
+        if (h === handler && shallowEqual(eventtypes, e, 2) && c === context) return;
     }
     if (k === changes_key) {
         if (!element.$needchanges) element.$needchanges = 0;

package/coms/zimoli/picture.js

@@ -27,6 +27,7 @@ var create = function (url, key, report_error) {
 
     var image = picture_();
     image.url = url;
+    var rotate = url.rotate | 0;
     if (广告 && !广告.parentNode) appendChild(image, 广告);
     if (isObject(url)) {
         if (key) {
@@ -69,6 +70,7 @@ var create = function (url, key, report_error) {
     };
     var imgpic;
     image.setImage = function (_imgpic) {
+        _imgpic.rotate = rotate;
         if (!isElement(_imgpic)) _imgpic = this;
         if (imgpic) {
             [].forEach.call(imgpic.attributes, a => {
@@ -109,6 +111,7 @@ var create = function (url, key, report_error) {
             marginTop
         };
     }
+    image.rotateTo(rotate);
     return image;
 };
 

package/coms/zimoli/popup.js

@@ -172,7 +172,7 @@ var isypop = function (target) {
     if (
         target.offsetWidth >= (innerWidth >> 1) &&
         target.offsetHeight < (innerHeight >> 1) ||
-        offsetParent.offsetWidth >= (innerWidth >> 1) &&
+        offsetParent && offsetParent.offsetWidth >= (innerWidth >> 1) &&
         offsetParent.offsetHeight < (innerHeight >> 1)) return true;
     if (
         nextSibling

package/coms/zimoli/select.js

@@ -2,15 +2,16 @@ var saved_list;
 var _remove = function () {
     var removing_list = saved_list;
     if (removing_list) {
-        setTimeout(function run() {
+        requestAnimationFrame(function run() {
             if (removing_list !== saved_list) return remove(removing_list);
             var { activeElement } = document;
-            a: if (!getTargetIn(removing_list, activeElement)) {
+            a: if (!getTargetIn(removing_list, activeElement) && !getTargetIn(removing_list.target, activeElement)) {
                 var extras = [].concat(removing_list.with);
                 for (var e of extras) {
                     if (getTargetIn(e, activeElement)) break a;
                 }
                 remove(removing_list);
+                removing_list.target.focus();
                 if (removing_list === saved_list) saved_list = null;
                 return;
             }
@@ -40,7 +41,35 @@ on('touchend')(window, function (event) {
         if (getTargetIn(saved_list, event.target)) return;
     }
     activeElement.blur();
-})
+});
+var setEmpty = function () {
+    if (isEmpty(this.value)) {
+        if (!this.empty) {
+            this.empty = true;
+            this.setAttribute('empty', '')
+        }
+    }
+    else {
+        if (this.empty) {
+            this.empty = false;
+            this.removeAttribute('empty');
+        }
+    }
+};
+var setFocus = function () {
+    if (saved_list && saved_list.target === this) {
+        if (!this.focused) {
+            this.focused = true;
+            this.setAttribute('focus', '');
+        }
+    }
+    else {
+        if (this.focused) {
+            this.focused = false;
+            this.removeAttribute('focus');
+        }
+    }
+}
 function select() {
     var [target, list, removeOnSelect, direction] = arguments;
     if (/^[yvxh]/i.test(removeOnSelect)) {
@@ -99,6 +128,8 @@ function select() {
         if (removeOnSelect === null) {
             onmousedown(list, preventDefault);
         }
+        on("touchend")(target, preventDefault);// 兼容火狐 android
+        on("touchend")(list, preventDefault);// 兼容火狐 android
         on("keydown.up")(target, preventDefault);
         on("keydown.down")(target, preventDefault);
         on("keydown.enter")(target, preventDefault1);
@@ -213,15 +244,26 @@ function select() {
     var mousedown = function () {
         initList();
         if (saved_list !== list || !isMounted(list)) {
-            if (saved_list && saved_list !== list) _remove();
-            if (document.activeElement !== target) target.focus();
+            if (saved_list && saved_list !== list) remove(saved_list);
             popup(list, target, direction);
+            requestAnimationFrame(/*兼容safari*/function () {
+                if (document.activeElement !== target) target.focus();
+            })
+            if (getTargetIn(list, document.activeElement)) {
+                on('blur')(document.activeElement, removeByBlur);
+            }
             saved_list = list;
         }
-        else _remove();
+        else {
+            remove(list);
+            if (saved_list === list) {
+                saved_list = null;
+                target.focus();
+            }
+        }
     };
     if (!target.$renders) {
-        target.$renders = [];
+        target.$renders = [setEmpty, setFocus];
     }
     target.$renders.push(setIcon);
     onclick(target, mousedown);

package/coms/zimoli/select.less

@@ -1,14 +1,23 @@
+& {
+    background: #fff;
+}
+
 select& {
     border: 1px solid #00000033;
     -webkit-appearance: none;
-    -moz-appearance: none;
-    height: 30px;
-    line-height: 30px;
-    padding: 0 16px;
+    appearance: none;
+    height: 28px;
+    line-height: 28px;
+    padding: 0 6px;
     outline: none;
     font-size: inherit;
     display: inline-block;
 
+    &:focus,
+    &[focus] {
+        border-color: #29c;
+    }
+
     &::-ms-expand {
         display: none;
     }
@@ -34,4 +43,13 @@ select& {
 
 model>& {
     width: 100%;
+}
+
+&[empty] {
+    color: #0009;
+
+    &:hover,
+    &:active {
+        color: #fff9;
+    }
 }

package/coms/zimoli/selectList.js

@@ -1,6 +1,12 @@
 var singleClick = function () {
     var node = this.parentNode;
-    if (node.activeNode === this) return;
+    if (node.activeNode === this) {
+        remove(node);
+        if (node.target) {
+            node.target.focus();
+        }
+        return;
+    }
     if (node.activeNode) {
         if (isObject(node.activeNode.origin)) node.activeNode.origin.selected = false;
         node.activeNode.removeAttribute("selected");
@@ -14,6 +20,7 @@ var singleClick = function () {
     if (isObject(this.origin)) this.origin.selected = true;
     dispatch(node, "change");
     if (getTargetIn(node, document.activeElement)) document.activeElement.blur();
+    remove(node);
 };
 var multipleClick = function () {
     var node = this.parentNode;
@@ -33,6 +40,11 @@ var multipleClick = function () {
 var searchinput = function () {
     var ipt = document.createElement("input");
     ipt.placeholder = '搜索';
+    on('mounted')(ipt, function () {
+        requestAnimationFrame(function () {
+            ipt.focus();
+        });
+    });
     return ipt;
 };
 
@@ -108,7 +120,7 @@ function main() {
 
     var hasIcon = false, iconed = '';
 
-    if (children.length > 6) {
+    if (children.length > 12) {
         var ipt = searchinput()
         page.insertBefore(ipt, page.firstChild);
         var searchtext = function () {

package/coms/zimoli/view.js

@@ -86,8 +86,10 @@ function getScrollbarWidth() {
 }
 var init = function () {
     init = function () { };
-    css("." + view.className.split(/\s+/)[0] + ">.body", {
-        marginRight: -getScrollbarWidth() + "px"
+    var className = view.className.split(/\s+/)[0];
+    css(`.${className}>.body,.${className}>[body]`, {
+        borderRight: 20 - getScrollbarWidth() + "px solid transparent",
+        marginRight: -20 + "px"
     });
 };
 var resize2 = function () {

package/coms/zimoli/view.less

@@ -25,8 +25,7 @@ body>& {
 
 >.body,
 >[body] {
-    padding: 6px 20px 6px 6px;
-    margin-right: -20px;
+    padding: 6px;
     display: block;
     width: auto;
     height: 100%;

package/coms/zimoli/vscroll.js

@@ -22,7 +22,6 @@ var scroll = function () {
     var { max, min } = Math;
     var scrollOutside = function (deltay) {
         var _box = this;
-        if (_box.YScrollBoxId === 1) return deltay;
         var offsetParent = _box.offsetParent;
         if (!offsetParent) return deltay;
         var _boxPosition = getScreenPosition(_box);

package/package.json

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