efront 4.22.3 → 4.22.4

package/apps/pivot/task/list.js

@@ -8,7 +8,7 @@ model.setReader('jscode', "text");
 return plist.bind(null, '任务管理', "task", refilm`
 *任务ID/key 100
 *任务名/name 100
-*是否启用/status radio 不启用,启用
+*是否启用/status radio 不启用#ccc,启用#396
 任务代码/code jscode
 / $ ${[
         {

package/coms/basic/refilm_decode.js

@@ -19,11 +19,16 @@ function scanBlock(piece) {
         res.push(a);
     };
     var avoid = false;
+    var instr = null;
     for (var cx = 0, dx = piece.length; cx < dx; cx++) {
         reg.lastIndex = cx;
         var m = reg.exec(piece);
         if (m) {
             var s = m[0];
+            if (instr) {
+                if (instr === s) instr = null;
+                continue;
+            }
             if (/^(\s+|\^)$/.test(s)) {
                 if (s === '^') {
                     avoid = res.length;
@@ -32,12 +37,10 @@ function scanBlock(piece) {
                     save(piece.slice(lastIndex, reg.lastIndex));
                 }
                 lastIndex = reg.lastIndex;
-            } else if (/^["']$/i.test(s)) {
-                var i = piece.indexOf(s, cx + 1);
-                if (i > 0) {
-                    cx = i;
-                    continue;
-                }
+            }
+            else if (/^[`"']$/i.test(s)) {
+                instr = s;
+                continue;
             }
             cx = m.index + s.length - 1;
         } else {
@@ -51,29 +54,39 @@ function scanBlock(piece) {
 
 function scanSlant(str, s, lastIndex = 0, end = str.length) {
     s = s.replace(/[\/]/g, '\\$&');
-    var reg = new RegExp(`${/\\[\s\S]/.source}|${s}`, 'g');
+    var reg = new RegExp(`${/\\[\s\S]/.source}|[${s}'"\`]`, 'g');
     var reg1 = new RegExp(`^${s}$`);
     var res = [];
     var start = lastIndex, start;
+    var instr = false;
     while (lastIndex < end) {
         reg.lastIndex = lastIndex;
         var match = reg.exec(str);
         if (!match) {
             break;
         }
+        var [s] = match;
+        if (instr) {
+            if (instr === s) instr = null;
+            continue;
+        }
+        if (/^['"`]$/.test(s)) {
+            instr = s;
+            continue;
+        }
         lastIndex = match.index + match[0].length;
-        if (!reg1.test(match[0])) {
+        if (!reg1.test(s)) {
             continue;
         }
         if (lastIndex === start) {
             lastIndex++;
             continue;
         }
-        res.push(str.slice(start, match.index).replace(/\\([\s\S])/g, '$1'));
+        res.push(strings.decode(str.slice(start, match.index)));
         start = lastIndex;
     }
     if (start < end) {
-        res.push(str.slice(start, end).replace(/\\([\s\S])/g, '$1'));
+        res.push(strings.decode(str.slice(start, end)));
     }
     return res;
 }
@@ -121,15 +134,28 @@ var createEval = function (express, value) {
         name: express
     });
 };
-
-var createOption = function (o) {
+var getColorFromTail = function (o) {
+    var m;
+    if (m = /\#(?:[0-9a-f]{3,4}){1,2}$/.exec(o)) {
+        o = o.slice(0, m.index);
+        return [o, color.format(m[0])];
+    }
+    return [o];
+}
+var createOption = function (o, i) {
     if (isObject(o)) {
+        if (!o.color) [o.name, o.color] = getColorFromTail(o.name);
         o.toString = toName;
         o.valueOf = toValue;
         return o;
     }
+    var [name, color] = getColorFromTail(o);
+    if (!color && !/[,\/]/.test(o)) return name;
+    var [name, key = i] = spreadkey(name);
     return {
-        name: o,
+        name,
+        key,
+        color,
         valueOf: toValue,
         toString: toName
     };
@@ -139,9 +165,9 @@ function unfoldOptions(size, options) {
     for (var cx = 0, dx = options.length; cx < dx; cx++) {
         var o = options[cx];
         if (typeof o === 'string') {
-            var [name, key = name] = spreadkey(o);
+            var [name, key = name, needs, color] = spreadkey(o);
             if (parseInt(key) === +key) key = +key;
-            o = { name, key };
+            o = { name, key, color, needs };
         }
         var range = rangereg.exec(o.name);
         if (range) {
@@ -269,13 +295,14 @@ function spreadkey(name) {
     }
     return [name, key, needs, holder];
 }
-function parseOptions(options) {
-    if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
+function parseOptions(size, options) {
+    if (typeof options === "string" && !/^[\$&]+\d+$/.test(options)) {
         var needUnfold = /^\[|\]$/.test(options);
         options = options.replace(/^\[|\]$/g, '');
         if (needUnfold || /,/.test(options)) options = scanSlant(options, ',');
         else options = scanSlant(options, "");
         if (needUnfold) unfoldOptions(size, options);
+        else options = options.map(createOption);
     }
     return options;
 }
@@ -333,7 +360,7 @@ function parse(piece) {
             return [, a];
         };
         var is = function (a) {
-            var reg = /^\$(?!\d)|[\*\+\-\!\-\$&\?\~\:;]|^[\*\+\-\!\-&\?\~]$/;
+            var reg = /^\$(?!\d)|\$$|^[\*\+\-\!\-&\?\~]|[\*\+\-\!\-&\?\~\:;]$|^[\*\+\-\!\-&\?\~]$/;
             if (!reg.test(a)) return a;
             [colon, a] = test(/\;$/, a);
             if (colon) colon = false;
@@ -342,9 +369,10 @@ function parse(piece) {
             [inlist, a] = test(/^[\+]|[\+]$/, a);
             [inlist, a] = test(/^[\!]|[\!]$/, a);
             [hidden, a] = test(/^\-|\-$/, a);
-            [readonly, a] = test(/^&|\$(?!\d)|[\$&]$/, a);
+            [readonly, a] = test(/^&|^\$(?!\d)|[\$&]$/, a);
             [delete_onempty, a] = test(/^\?|\?$/, a);
             [delete_onsubmit, a] = test(/^\~|\~$/, a);
+
             return a.replace(reg, '');
         };
         var type1 = is(type);
@@ -451,8 +479,8 @@ function parse(piece) {
             editable = true;
             options = options.replace(/^[\+\-\*]|[\+\*\-]$/g, '');
         }
-        options = parseOptions(options);
-        avoid = parseOptions(avoid1 || avoid);
+        options = parseOptions(size, options);
+        avoid = parseOptions(size, avoid1 || avoid);
         name = is(name);
         key = is(key);
     }

package/coms/basic/refilm_decode_test.js

@@ -22,3 +22,4 @@ test(refilm`连城剑法 别名 ^[唐诗剑法/0,躺尸剑法/1]`, ['avoid', 1,
 test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1] ^[a,b]`, ['options', 1, 'key'], 1);
 test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1] ^[a,b]`, ['avoid', 1, 'key'], 'b');
 test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1] ^${[{ key: 'a' }, { key: 'c' }]}`, ['avoid', 1, 'key'], 'c');
+test(refilm`连城剑法 别名 [唐诗剑法/0/#c29,躺尸剑法/1]`, ['options', 0, 'color'], '#c29');

package/coms/compile/translate.js

@@ -75,7 +75,7 @@ function getI18nPrefixedText(code, dist = []) {
     return dist;
 }
 var ctn = function (tt, t) {
-    var tn = scanner2(tt.replace(/[\$#]+(\d+)/g, (_, i) => {
+    var tn = scanner2(tt.replace(/[\$&]+(\d+)/g, (_, i) => {
         var a = (i << 1) - 1;
         if (a in t) return `\${${a}}`;
         return _;
@@ -152,8 +152,8 @@ function translate([imap, supports], code) {
                 var o = scanner2('={}')[1];
                 Object.keys(f).forEach(k => {
                     var v = f[k];
-                    if (/[\$#]\d+/.test(v)) {
-                        var a = v.replace(/^[\$#]+/, '');
+                    if (/[\$&]\d+/.test(v)) {
+                        var a = v.replace(/^[\$&]+/, '');
                         var a = (a << 1) - 1;
                         if (a in t) v = t[a];
                         else v = scanner2(JSON.stringify(v));

package/coms/zimoli/button.js

@@ -27,7 +27,7 @@ function button(texter, type) {
         _texter = _label.cloneNode();
         if (isString(texter)) {
             if (!type) {
-                texter = texter.replace(/#\w*/, function (w) {
+                texter = texter.replace(/#\w*$/, function (w) {
                     if (/^#([a-f\d]{3,4}){1,2}$/.test(w)) {
                         type = w;
                     }

package/coms/zimoli/model.js

@@ -222,7 +222,15 @@ var readonly_types = {
             if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
             var o = field.optionsMap[v];
             try { this.setAttribute(field.key, v); } catch { }
-            if (isObject(o)) return `<s></s>` + o.name;
+            if (isObject(o)) {
+                if (o.color) {
+                    css(this, { color: o.color });
+                    var b = document.createElement('label');
+                    b.innerText = o.name;
+                    return b;
+                }
+                return o.name;
+            }
             if (isHandled(o)) return o;
         }
         if (isEmpty(v)) v = '';
@@ -293,6 +301,19 @@ var getOptionsFrom = function () {
     var { data, field } = this;
     return data[field.options_from];
 };
+function setModel(ipt) {
+    var elem = this;
+    if (isHandled(ipt) && ipt !== elem) {
+        if (isNode(ipt)) {
+            var model = new Model(getScopeValue, setScopeValue, ipt);
+            model.hook(elem, elem.field.option_to ? copyOptionData : true);
+            appendChild(elem, ipt);
+        }
+        else {
+            elem.innerText = ipt;
+        }
+    }
+}
 function setBinder(elem, binder) {
     if (binder === elem.$binder) return;
     removeFromList(elem.$renders, elem.$binder);
@@ -303,17 +324,11 @@ function setBinder(elem, binder) {
     }
     else {
         var ipt = binder(elem);
-        binder = null;
-        if (isHandled(ipt) && ipt !== elem) {
-            if (isNode(ipt)) {
-                var model = new Model(getScopeValue, setScopeValue, ipt);
-                model.hook(elem, elem.field.option_to ? copyOptionData : true);
-                appendChild(elem, ipt);
-            }
-            else {
-                elem.innerHTML = ipt;
-            }
+        if (ipt && isFunction(ipt.then)) {
+            ipt.then(setModel.bind(elem));
         }
+        else setModel.call(elem, ipt);
+        binder = null;
     }
     elem.$binder = binder;
 }

package/coms/zimoli/model.less

@@ -78,4 +78,23 @@
 @u(3);
 @u(4);
 @u(5);
-@u(6);
+@u(6);
+
+&[readonly] {
+
+    &[type=radio] {
+        &:before {
+            vertical-align: middle;
+            content: '';
+            border-radius: 50%;
+            box-sizing: border-box;
+            border: 6px solid;
+            display: inline-block;
+            margin: 0 6px;
+        }
+
+        label {
+            color: #333;
+        }
+    }
+}

package/coms/zimoli/table.less

@@ -244,4 +244,22 @@ thead {
 [type=number],
 [type=price] {
     float: right;
+}
+
+tbody,
+[tbody] {
+
+    [type=jscode],
+    [type=function] {
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        text-overflow: ellipsis;
+        line-height: 16px;
+        font-size: 14px;
+        white-space: pre;
+        font-family: Consolas, "Courier New", monospace;
+        color: #666;
+        overflow: hidden;
+    }
 }

package/coms//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -221,7 +221,8 @@
             }
             if (anchorOffset >= anchorNode.nodeValue.length) {
                 followChar = anchorNode.nextSibling || anchorNode.parentNode.nextSibling;
-                if (followChar.nodeType === 1) {
+                if (!followChar) followChar = '';
+                else if (followChar.nodeType === 1) {
                     beforeText = /^text$/i.test(followChar.tagName);
                     followChar = followChar.innerText.charAt(0);
                 }
@@ -263,7 +264,6 @@
         var { data, inputType } = event;
         coderid++;
         var patchAfter = '';
-        console.log("follow-char", followChar, 'data', data, 'anchor-char', anchorChar);
         switch (inputType) {
             case "insertText":
                 if (data === ' ') return;
@@ -289,10 +289,7 @@
                 if (anchorChar in pairsmap && followChar === pairsmap[anchorChar]) {
                     document.execCommand('forwardDelete');
                 }
-                if (inText) return;
-                updatechar();
-                if (inText) return;
-                break;
+                return;
 
         }
         markAnchorOffset(光标 + patchAfter);
@@ -307,7 +304,6 @@
         markedText = await 上色.text(coder.type, markedText);
         if (coderid !== id) return;
         更新(markedText);
-        dispatch(coder, 'change');
         return;
     }, -60);
     var keytab = function (direction) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.22.3",
+    "version": "4.22.4",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {