efront 4.3.3 → 4.3.4

package/apps/pivot/task/list.js

@@ -1,7 +1,7 @@
 plist.bind(null, '任务管理', "task", refilm`
 *任务ID/key 100
 *任务名/name 100
-*是否启用/status radio [不启用,启用]
+*是否启用/status radio 不启用,启用
 任务代码/code text
 / $ ${[
     {

package/coms/basic/refilm_decode.js

@@ -132,7 +132,9 @@ function unfoldOptions(size, options) {
     for (var cx = 0, dx = options.length; cx < dx; cx++) {
         var o = options[cx];
         if (typeof o === 'string') {
-            o = { name: o, key: o };
+            var [name, key = name] = spreadkey(o);
+            if (parseInt(key) === +key) key = +key;
+            o = { name, key };
         }
         var range = rangereg.exec(o.name);
         if (range) {
@@ -236,6 +238,28 @@ var getComment = function (piece) {
     }
     return '';
 };
+function spreadkey(name) {
+    if (/^\([\s\S]*\)$/.test(name) && /,/.test(name)) {
+        var [, name, rest_piece] = /^([\s\S]*?),([^\]]*)$/.exec(name.slice(1, name.length - 1));
+        if (rest_piece && !/=/.test(rest_piece)) {
+            var needs = { [name]: parseValue(rest_piece) };
+        } else {
+            var needs = scanNeeds(rest_piece);
+        }
+    }
+    if (/^\[[\s\S]*\]$/.test(name)) {
+        repeat = true;
+        name = name.replace(/^\[|\]$/g, '');
+        if (/\,/.test(name)) {
+            var commaindex = name.indexOf(",");
+            var endwith = parseKV(name.slice(commaindex + 1));
+            endwith = parseValue(endwith);
+            name = name.slice(0, commaindex);
+        }
+    }
+    var [name, key] = scanSlant(name, '/', 0, name.length + 1);
+    return [name, key, needs];
+}
 function parse(piece) {
     if (/^[\-#]+$/.test(piece[0])) {
         var piece0 = piece.pop();
@@ -268,7 +292,8 @@ function parse(piece) {
             required, inlist, hidden, readonly,
             delete_onempty, delete_onsubmit,
         } = name;
-    } else {
+    }
+    else if (typeof type === 'string') {
         var test = (reg, a) => {
             if (reg.test(a)) {
                 return true;
@@ -305,25 +330,7 @@ function parse(piece) {
                     last_type = type;
                 }
             }
-            if (/^\([\s\S]*\)$/.test(name) && /,/.test(name)) {
-                var [, name, rest_piece] = /^([\s\S]*?),([^\]]*)$/.exec(name.slice(1, name.length - 1));
-                if (rest_piece && !/=/.test(rest_piece)) {
-                    var needs = { [name]: parseValue(rest_piece) };
-                } else {
-                    var needs = scanNeeds(rest_piece);
-                }
-            }
-            if (/^\[[\s\S]*\]$/.test(name)) {
-                repeat = true;
-                name = name.replace(/^\[|\]$/g, '');
-                if (/\,/.test(name)) {
-                    var commaindex = name.indexOf(",");
-                    var endwith = parseKV(name.slice(commaindex + 1));
-                    endwith = parseValue(endwith);
-                    name = name.slice(0, commaindex);
-                }
-            }
-            [name, key] = scanSlant(name, '/', 0, name.length + 1);
+            [name, key, needs] = spreadkey(name);
             if (key === undefined && !/^(title|label|headline)$/i.test(type)) key = name;
         }
         if (/^[a-z\d]+\/?\d+$/i.test(type)) {
@@ -411,6 +418,9 @@ function parse(piece) {
         name = is(name);
         key = is(key);
     }
+    else if (typeof name === 'string') {
+        [name, key = name, needs] = spreadkey(name);
+    }
     if (typeof size === 'string') size = parseFloat(size);
     var field = {
         name, type, key, value, comment, options,

package/coms/basic/refilm_decode_test.js

@@ -1,2 +1,19 @@
-var fields = refilm_decode(["启动时间/time $1"]);
-console.log(fields);
+var refilm = function (a) {
+    return refilm_decode.apply(null, [a.raw].concat([].slice.call(arguments, 1)));
+};
+var test = function (fields, key, expect) {
+    var valid = assert(seek(fields[0], key), expect);
+    if (!valid) console.log(fields)
+};
+test(refilm`启动时间/time $1`, 'key', 'time');
+test(refilm`启动时间/time $1`, 'type', '$1');
+test(refilm`启动时间/time ${test}`, 'key', "time");
+test(refilm`启动时间/time ${test}`, 'type', test);
+test(refilm`天下第一 四人组 ${["天地玄黄", "湘西四鬼"]}`, 'key', "天下第一");
+test(refilm`天下第一 四人组 ${["天地玄黄", "湘西四鬼"]}`, 'type', "四人组");
+test(refilm`天下第一 四人组 ${["天地玄黄", "湘西四鬼"]}`, ['options', 1], "湘西四鬼");
+test(refilm`连城剑法 别名 唐诗剑法,躺尸剑法`, ['options', 1], "躺尸剑法");
+test(refilm`连城剑法 别名 [唐诗剑法,躺尸剑法]`, ['options', 1, 'name'], "躺尸剑法");
+test(refilm`连城剑法 别名 [唐诗剑法,躺尸剑法]`, ['options', 1, 'key'], "躺尸剑法");
+test(refilm`连城剑法 别名 [唐诗剑法,躺尸剑法]`, ['options', 1, 'value'], 1);
+test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1]`, ['options', 1, 'key'], 1);

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

@@ -401,10 +401,11 @@ var getFromScopeList = function (name, varsList, value = name) {
 };
 var removeSelectorSpace = a => a.trim().replace(/\s*([\+~\>])\s*/g, "$1");
 var fixBase = function (b, a) {
-    return a.split(/,\s*/).map(a => {
+    var s = splitParams(a);
+    return splitParams(a).map(a => {
         if (presets.test(a)) a = `@{${a}}`;
         var replaced = false;
-        return b.split(/\s*,\s*/).map(b => {
+        return splitParams(b).map(b => {
             b = b.replace(/^(&|\:scope|\:root)\s*/g, "");
             if (!b) return a;
             var a1 = a.replace(/&|\:scope|\:root/g, function (match) {

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

@@ -71,4 +71,5 @@ assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:
 assert(素馨(`@a:1px;@margin-x:@a+10px; a{m:-@margin-x}`), `a{m:-11px;}`);
 assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
 assert(素馨(`@media screen{&.a{b:1}}`,'a'), `@media screen{a.a{b:1;}}`);
-assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`,'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
+assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`,'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
+assert(素馨(`b{:not([resizing], [dragging]) {transition: padding .2s, margin .2s;}}`), `b :not([resizing], [dragging]){transition:padding .2s, margin .2s;}`);

package/coms/explorer/main.js

@@ -20,20 +20,30 @@ var touch = {
          * @type {Element}
          */
         var t = this;
-        var a = this.$scope.toActive(e);
-        touchitems = this.querySelectorAll("fileitem");
-        if (a && this.$scope.selected.indexOf(a.$scope.d) >= 0) {
-            dragger = e;
-            if (!drag.target) drag(this.$scope.selected.length === 1 ? a : this.querySelectorAll(".focused"), e);
-            return;
+        var start = () => {
+            if (onclick.preventClick) return;
+            var a = t.$scope.toActive(e);
+            touchitems = t.querySelectorAll("fileitem");
+            if (a && t.$scope.selected.indexOf(a.$scope.d) >= 0) {
+                dragger = e;
+                if (!drag.target) drag(t.$scope.selected.length === 1 ? a : t.querySelectorAll(".focused"), e);
+                return;
+            }
+            var pos = getScreenPosition(t.parentNode);
+            var pos2 = getScreenPosition(t.previousElementSibling);
+
+            rect.limit = [pos.left + t.parentNode.clientLeft, Math.max(pos.top, pos2.bottom + 1)];
+            rect.event = e;
+            rect.setAttribute('style', '');
+            css(rect, { left: e.clientX - pos.left - t.clientLeft, top: e.clientY - t.clientTop, width: 0, height: 0 })
+        };
+        if (/^touch/.test(e.type)) {
+            touch.ing = setTimeout(start, 600);
+        }
+        else {
+            start();
         }
-        var pos = getScreenPosition(t.parentNode);
-        var pos2 = getScreenPosition(t.previousElementSibling);
 
-        rect.limit = [pos.left + t.parentNode.clientLeft, Math.max(pos.top, pos2.bottom + 1)];
-        rect.event = e;
-        rect.setAttribute('style', '');
-        css(rect, { left: e.clientX - pos.left - t.clientLeft, top: e.clientY - t.clientTop, width: 0, height: 0 })
     },
     move(e) {
         if (!onclick.preventClick) return;
@@ -72,6 +82,7 @@ var touch = {
                 }
             }
             if (!tiped && drag.tip) css(drag.tip, 'display:none');
+            e.moveLocked = 2;
             return;
         }
         if (e.type !== 'mousemove') return;
@@ -83,6 +94,7 @@ var touch = {
     },
     async end(e) {
         touchitems = null;
+        clearTimeout(touch.ing);
         if (dragger) {
             delete drag.tip;
             dragger = null;

package/coms/zimoli/AudioContext_test.html

@@ -1,5 +1,5 @@
-<div ng-class="{even:i%2===1,odd:i%2===0}" v-for="(r,i) in rates" hz:='r[5]'>
-    <span ng-if="i%2===0" v-bind="i/2 -8"></span>
+<div ng-class="{even:i&1,odd:!(i&1)}" v-for="(r,i) in rates" hz:='r[5]'>
+    <span ng-if="!(i&1)" v-bind="i/2 -8"></span>
     <button ng-repeat="o in r" _rate=o>
         <span ng-bind="format(o)"></span>
     </button>

package/coms/zimoli/AudioContext_test.js

@@ -11,45 +11,72 @@ function piano() {
     return res;
 }
 function main() {
-    var page = vbox('x');
+    var page = document.createElement('div');
     page.innerHTML = AudioContext_test;
+    var mouse_target = null;
+    var setBuffer = function (btn) {
+        var { gainNode, audioCtx, oscillator } = btn;
+        var gain = gainNode.gain;
+        var hz = btn.rate;
+        var currentTime = audioCtx.currentTime;
+        gain.setValueAtTime(65536 / Math.log2(hz), currentTime + 0.01);
+        // gain.linearRampToValueAtTime(0, currentTime + 2);
+        gain.exponentialRampToValueAtTime(0.001, currentTime + 1);
+    };
+    var init = function (btn) {
+        if (btn.audioCtx) {
+            return btn;
+        }
+        var audioCtx = btn.audioCtx = new AudioContext();
+        var gainNode = btn.gainNode = audioCtx.createGain();
+        var oscillator = btn.oscillator = audioCtx.createOscillator();
+        var hz = btn.rate;
+        oscillator.connect(gainNode);
+        gainNode.connect(audioCtx.destination);
+        oscillator.type = 'sine';
+        oscillator.frequency.value = -hz;
+        oscillator.start(0);
+        return { audioCtx, gainNode, oscillator };
+    };
+    var drop = function (btn) {
+        btn.oscillator.stop();
+        btn.audioCtx = null;
+        btn.gainNode = null;
+        btn.oscillator = null;
+    }
     var click = {
-        start() {
-            if (this.audioCtx) return;
-            var hz = this.rate;
-            var audioCtx = this.audioCtx = new AudioContext();
-            var gainNode = this.gainNode = audioCtx.createGain();
-            var oscillator = this.oscillator = audioCtx.createOscillator();
-            oscillator.connect(gainNode);
-            gainNode.connect(audioCtx.destination);
-            oscillator.type = 'sine';
-            oscillator.frequency.value = -hz;
-            gainNode.gain.setValueAtTime(0, audioCtx.currentTime);
-            gainNode.gain.linearRampToValueAtTime(65536 / Math.log2(hz), audioCtx.currentTime + 0.01);
-            oscillator.start(audioCtx.currentTime);
-            addClass(this, 'pressed');
+        start(event) {
+            var btn = event.target;
+            var btn = getTargetIn(b => hasClass(b, 'button'), event.target);
+            if (btn.pressed) return;
+            btn.pressed = true;
+            var { oscillator, audioCtx, gainNode } = init(btn);
+            setBuffer(btn);
+            audioCtx.resume();
+            addClass(btn, 'pending');
+            if (!event.touches) mouse_target = btn;
         },
-        end() {
-            var { gainNode, oscillator, audioCtx } = this;
+        async end(event) {
+            if (!event.touches) var btn = mouse_target;
+            else var btn = getTargetIn(b => hasClass(b, 'button'), event.target);
+            if (!btn) return;
+            btn.pressed = false;
+            var { gainNode, oscillator, audioCtx } = btn;
             if (!gainNode || !oscillator) return;
-            gainNode.gain.exponentialRampToValueAtTime(0.001, audioCtx.currentTime + 1);
-            oscillator.stop(audioCtx.currentTime + 1);
-            this.audioCtx = null;
-            this.oscillator = null;
-            this.gainNode = null;
-            removeClass(this, 'pressed');
+            await audioCtx.suspend();
+            drop(btn);
+            removeClass(btn, 'pending');
         }
     }
+    on("touchstart")(page, click.start);
+    on("touchend")(page, click.end);
+    on('mousedown')(page, click.start);
+    bind('mouseup')(page, click.end);
     renderWithDefaults(page, {
         rates: piano(),
         audioCtx: null,
         gainNode: null,
         oscillator: null,
-        button(a) {
-            var b = button(a);
-            moveupon(b, click);
-            return b;
-        },
 
         format(o) {
             var i = o.toFixed(1).indexOf('.');

package/coms/zimoli/AudioContext_test.less

@@ -48,7 +48,7 @@
             box-shadow: 0 0 12px -4px #0003;
         }
 
-        &.active {
+        &.pending {
             z-index: 0;
 
             >.track {
@@ -108,7 +108,7 @@
 
     }
 
-    button.pressed {
+    button.pending {
         color: red;
     }
 

package/coms/zimoli/drag.js

@@ -59,7 +59,7 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
     }
     var extraClones;
     var mousemove = function (event) {
-        if (event.moveLocked) return;
+        if (+event.moveLocked === 1) return;
         if (/resize/i.test(getComputedStyle(document.body).cursor)) return;
         if (!saved_delta.ing) {
             var [target_left, target_top] = getOffset(target);

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/package.json

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