efront 4.16.0 → 4.17.0

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,18 @@
+- zh-CN: 目标文件存在外部引用项$1
+  en:    The target file has an external reference item of $1
+
+- zh-CN: 输入$1
+  en:    Enter $1
+
+- zh-CN: 选择日期
+  en:    Select date
+
+- zh-CN: 选择日期和时间
+  en:    Select date and time
+
+- zh-CN: 选择$1
+  en:    Select $1
+
 - zh-CN: 无法找到可用的$1支持库
   en:    Unable to find available $1 support library
 

package/coms/basic/Matrix.js

@@ -232,8 +232,11 @@ class Matrix extends Array {
         var A = this.slice().inverse();
         return resolve(A, s);
     }
+    getTransform() {
+        return [this[0], this[1], this[3], this[4], this[6], this[7]];
+    }
     toDOMString() {
-        if (this.size()[1] === 2) return `matrix(${[this[0], this[1], this[3], this[4], this[6], this[7]]})`;
+        if (this.size()[1] === 2) return `matrix(${this.getTransform()})`;
         return `matrix(${this})`;
     }
 }

package/coms/basic/mark.js

@@ -86,15 +86,7 @@ var power = function (source, search) {
     var match_text = matchers[0];
     var match_start = matchers[1];
     var match_length = matchers[3] - matchers[2];
-    if (search.length === 1) {
-        var p = 0;
-        var res = source.replace(new RegExp(search.replace(/[\\\*\?\+\(\)\[]/g, "\\$&"), "ig"), (m, i) => {
-            if (!p) p = .1 / (1 + i);
-            return MARK_PRE1 + m + MARK_AFT1;
-        });
-        return [p, res];
-    }
-    if (match_length > 1) {
+    if (match_length >= 1) {
         var match_text_pre = source.slice(0, match_start);
         var match_text_aft = source.slice(match_start + match_text.length);
         var pp = 0, ap = 0;

package/coms/compile/Javascript.js

@@ -44,7 +44,7 @@ var colonstrap_reg = /^(case|default)$/;
 class Javascript extends Program {
     straps = straps;
     value_reg = /^(false|true|null|Infinity|NaN|undefined|eval)$/
-    transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/
+    transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
     defaultType = EXPRESS;
@@ -796,7 +796,7 @@ var removeImport = function (c, i, code) {
             else {
                 if (!name) name = name1;
                 used[name1].forEach(u => {
-                    compile$patchname(name, u, ".default");
+                    patchname(name, u, ".default");
                 });
             }
         }
@@ -889,6 +889,16 @@ var removeExport = function (c, i, code) {
         code.exportDefault = true;
         n.next.isExpress = true;
         c.type = EXPRESS;
+        var d = n.next;
+        if (d.type === STRAP && /^(class|function|var|let|const)$/.test(d.text)) {
+            d = d.next;
+            if (d.type === EXPRESS && !/[\.\[]/.test(d.text)) {
+                code.used[d.tack].forEach(o => {
+                    if (d === o) return;
+                    patchname('', o, "exports.default");
+                })
+            }
+        }
         return;
     }
     var [dec, map, o] = getDeclared(n.next, 'export');
@@ -973,10 +983,14 @@ Javascript.prototype.newVar = function (used, string_template) {
     return name;
 }
 Javascript.prototype.fix = function (code) {
+    var hasExport = false;
     backEach(code, function (o, i) {
         if (o.type !== STRAP) return;
         if (o.text === 'import') removeImport.call(this, o, i, code);
-        else if (o.text === 'export') removeExport.call(this, o, i, code);
+        else if (o.text === 'export') {
+            hasExport = true;
+            removeExport.call(this, o, i, code);
+        }
     }, this);
     if (code.exportStars) {
         var exportStars = code.exportStars;
@@ -1045,8 +1059,10 @@ Javascript.prototype.fix = function (code) {
             }
         });
     }
+    if (hasExport) code.export = true;
     relink(code);
     setqueue(code);
+    return code;
 }
 Javascript.prototype.createString = createString;
 Javascript.prototype.createScoped = createScoped;

package/coms/compile/Javascript_test.js

@@ -7,6 +7,7 @@ var testFix = function (a, e) {
 }
 js.debug = true;
 assert(scanner2("/a/g", js)[0].type, common.QUOTED);
+testFix(`export default function a(){} a.a=1`, `exports.default = function a() {} exports.default.a = 1`);
 testFix(`export * from "a";`, 'var a = require("a");\r\nexports.default = undefined\r\nextendIfNeeded(exports, a)');
 testFix(`export {A} from "a";`, 'var a = require("a")\r\nexports.A = a.A;');
 testFix(`import a from "a";console.log(a)`, 'var a = require("a"); console.log(a.default)');

package/coms/compile/common.js

@@ -813,9 +813,10 @@ var createScoped = function (parsed, wash) {
                 else while (o && (o.type !== SCOPED || o.entry === '[')) {
                     o = o.next;
                     if (o && o.type === EXPRESS) {
-                        saveTo(used, o.text, o);
+                        var tack = o.text.replace(/[\.\[][\s\S]*$/, '');
+                        saveTo(used, tack, o);
                         if (o.prev && o.prev.type === STRAP && o.prev.text === 'extends') continue;
-                        lets[o.text] = true;
+                        lets[tack] = true;
                         o.kind = isFunction ? 'function' : 'class';
                         o = o.next;
                     }
@@ -1544,6 +1545,7 @@ var isHalfSentence = function (body, i) {
     while (a && a.type & (SPACE | COMMENT)) a = body[--i];
     if (!a) return false;
     if (a.type === STRAP && a.text === 'else') return true;
+    if (a.type === STAMP && (a.unary || !/^(;|\+\+|\-\-)$/.test(a.text))) return true;
     if (a.type !== SCOPED || a.entry !== "(") return false;
     a = a.prev;
     if (!a || a.type !== STRAP) return false;

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/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/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/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.16.0",
+    "version": "4.17.0",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {