efront 4.4.14 → 4.5.3

package/coms/pivot/pedit.js

@@ -2,21 +2,29 @@ function send(type, key, value, origin) {
     return data.from(origin ? "edit" : "add", {
         type,
         key: encode62.timeencode(key),
-        value: encode62.timeencode(JSON.stringify(value)),
-    }).loading_promise;
+        value: isHandled(value) ? encode62.timeencode(JSON.stringify(value)) : '',
+    }, e => e ? JSAM.parse(encode62.timedecode(e)) : '').loading_promise;
 }
 function pedit(title, type, params, idkey = params.fields[0].key) {
+    var pdata = params.data;
     return frame$edit(title, {
         submit(a, fields) {
             a = submit(fields, a);
-            return send(type, a[idkey], a, params.data);
+            return send(type, a[idkey], a, pdata);
         },
-
     }, params);
 }
 pedit.create = function (type, key, value) {
     return send(type, key, value, false);
 }
-pedit.update = function (type, key, value) {
+var query = pedit.query = function (type, key) {
+    return send(type, key, null, true);
+}
+var update = pedit.update = function (type, key, value) {
     return send(type, key, value, true);
+}
+pedit.merge = async function (type, key, params) {
+    var data = await query(type, key);
+    extendIfNeeded(params, data);
+    return update(type, key, params);
 }

package/coms/pivot/plist.js

@@ -1,5 +1,10 @@
-
-function main() {
+function load(type) {
+    return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
+}
+function remove(type, key) {
+    return data.from("edit", { type, key: encode62.timeencode(key), value: encode62.timeencode("") }).loading_promise;
+}
+function plist() {
     var title, type, fields, edit_ref, options, idkey, buttons;
     var parse = function (a) {
         switch (typeof a) {
@@ -33,10 +38,10 @@ function main() {
     if (!idkey) idkey = fields[0].key;
     return frame$list(title, {
         load() {
-            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
+            return load(type);
         },
         remove(o) {
-            return data.from("edit", { type, key: encode62.timeencode(o[idkey]), value: encode62.timeencode("") }).loading_promise;
+            return remove(type, o[idkey]);
         },
         fields,
         buttons,
@@ -48,4 +53,6 @@ function main() {
         move.setPosition(p, [.5, .5]);
         return p;
     });
-}
+}
+plist.load = load;
+plist.remove = remove;

package/coms/reptile/colored_console.js

@@ -2,10 +2,12 @@
 var colored = Object.create(null);
 var lazy = require("../basic/lazy");
 var colors = require("./colors");
+var renderTags = require("../basic/renderTags");
 var strings = require("../basic/strings");
 var lastLogLength = 0;
 var needNextLine = false;
 var getColor = function (c) {
+    if (!c) return colors.Reset;
     switch (c) {
         case "red":
         case "error":
@@ -30,23 +32,9 @@ var getColor = function (c) {
     }
     return '';
 };
-var colorReg = /<(\/?)([a-z][\w]*)\>/ig;
+var colorReg = renderTags.reg;
 var renderColor = function (obj) {
-    var colorpath = [];
-    return String(obj).replace(colorReg, function (_, e, c) {
-        if (!c || c.length < 3 || !getColor(c)) return _;
-        if (e) {
-            colorpath.pop();
-            c = colorpath[colorpath.length - 1];
-        }
-        else colorpath.push(c);
-        if (c) var color = getColor(c);
-        var res = [];
-        if (e) res.push(colors.Reset);
-        if (color) res.push(color);
-        if (res.length) return res.join('');
-        return _;
-    });
+    return renderTags(obj, getColor);
 };
 
 var write = function (hasNewLine, str) {
@@ -195,7 +183,7 @@ var format = function (arg, deep = 0) {
         }
         if (arg instanceof Buffer || arg instanceof ArrayBuffer || arg instanceof SharedArrayBuffer) {
             var data = new Uint8Array(arg.buffer || arg, arg.byteOffset || 0, arg.byteLength);
-            return `<magenta><${arg.constructor.name} ${Array.prototype.slice.call(data, 0, 20).map(a => a < 16 ? "0" + a.toString(16) : a.toString(16)).join(' ')}${arg.byteLength > 20 ? ` ... 其他 ${arg.byteLength - 20} 字节` : ''}></megenta>`;
+            return `<magenta><${arg.constructor.name} ${Array.prototype.slice.call(data, 0, 20).map(a => a < 16 ? "0" + a.toString(16) : a.toString(16)).join(' ')}${arg.byteLength > 20 ? ` ... 其他 ${arg.byteLength - 20} 字节` : ''}></magenta>`;
         }
         else if (isFinite(arg.length)) {
             var entry = "[";

package/coms/zimoli/appendChild.js

@@ -9,9 +9,9 @@ function hasEnterStyle(e) {
 }
 
 function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
-    if (node.isMounted) return;
+    if (node.$mounted) return;
     if (node.nodeType !== 1 && node.nodeType !== 8) return;
-    node.isMounted = true;
+    node.$mounted = true;
     dispatch(node, append);
     var children = Array.apply(null, node.childNodes);
     for (var c of children) {
@@ -71,6 +71,7 @@ function insertAfter(alreadyMounted, obj, transition) {
     children = children.reverse();
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
+        if (!o) continue;
         if (o.removeTimer) clearTimeout(o.removeTimer);
         parent.insertBefore(o, alreadyMounted.nextSibling);
         o.with && insertBefore(alreadyMounted.nextSibling, o.with, transition);

package/coms/zimoli/autofocus.js

@@ -1,7 +1,7 @@
 function autofocus(e) {
-    if (!e.renders) e.renders = [];
+    if (!e.$renders) e.$renders = [];
     var savedElement;
-    e.renders.push(function () {
+    e.$renders.push(function () {
         var parent = rootElements[rootElements.length - 1] || document.body;
         if (savedElement === this) {
             if (this !== parent || getTargetIn(parent, document.activeElement)) return;

package/coms/zimoli/button.less

@@ -1,7 +1,10 @@
 @default-color: #0092cc;
 
+:not(button, a)& {
+    display: inline-block;
+}
+
 & {
-    font-size: 14px;
     width: auto;
     line-height: 28px;
     background-color: @default-color;
@@ -11,7 +14,6 @@
     position: relative;
     border: none;
     margin: 0;
-    display: inline-block;
     white-space: nowrap;
     text-align: center;
     overflow: hidden;
@@ -179,7 +181,6 @@
             content: "↻";
             font-family: 'Times New Roman', Times, serif;
             display: inline-block;
-            vertical-align: middle;
             position: absolute;
             animation: busy-pending 2s linear 0s infinite;
         }
@@ -239,6 +240,7 @@ a&,
             opacity: 0;
             box-shadow: none;
             background: none;
+            display: none;
         }
     }
 

package/coms/zimoli/checker.js

@@ -1,15 +1,34 @@
-function main(elem = document.createElement("check")) {
-    var page = elem;
-    page.innerHTML = checker;
-    page.setValue = function (value) {
-        value = !!value;
-        if (value === this.value) return;
-        this.value = value;
-        if (value) {
-            addClass(page, 'checked');
-        } else {
-            removeClass(page, 'checked');
-        }
-    };
-    return page;
-}
+var falseMap = Object.create(null);
+falseMap["off"] = "on";
+falseMap["false"] = "true";
+falseMap["null"] = "true";
+falseMap["0"] = "1";
+var trueMap = Object.create(null);
+for (var k in falseMap) trueMap[falseMap[k]] = falseMap[k];
+var isTrue = function (v) {
+    return !!+v || v in trueMap;
+};
+var changeValue = function (value) {
+    if (typeof value === 'boolean') return !value;
+    if (value & 1 === value) return 1 - value;
+    if (value in trueMap) return trueMap[value];
+    if (typeof value === 'number') return +!+value;
+    return !+value;
+};
+var setValue = function (value) {
+    if (value === this.value) return;
+    this.value = value;
+    value = isTrue(value);
+    if (value) {
+        addClass(this, 'checked');
+    } else {
+        removeClass(this, 'checked');
+    }
+};
+function checker(ck = document.createElement('check')) {
+    ck.innerHTML = template;
+    ck.setValue = setValue;
+    return ck;
+}
+checker.isTrue = isTrue;
+checker.changeValue = changeValue;

package/coms/zimoli/checker.less

@@ -3,14 +3,13 @@
     width: .8em;
     position: relative;
     border: .1em solid;
-    margin-right: .3em;
+    margin: -0.06em .3em -0.06em 0;
     font-family: sans-serif;
     display: inline-block;
     line-height: 1;
     text-align: center;
-    margin-top: .15em;
+    box-sizing: border-box;
     border-radius: .12em;
-    vertical-align: middle;
 
     >s {
         display: none;

package/coms/zimoli/container.js

@@ -1,34 +1,45 @@
-var change = async function (data) {
-    if (!data) remove(this.with);
-    else if (isNode(data)) {
-        if (isElement(data) && this.$struct.copys) {
+var change = lazy(async function (src) {
+    if (src !== this.$src) return;
+    if (!src) remove(this.with);
+    else if (isNode(src)) {
+        if (isElement(src) && this.$struct.copys) {
             for (var c of this.$struct.copys) {
                 if (c.name === 'class') {
-                    addClass(data, c.value);
+                    addClass(src, c.value);
                 }
                 else if (c.name === 'style') {
-                    css(data, c.value);
+                    css(src, c.value);
                 }
-                else data.setAttribute(c.name, c.value);
+                else src.setAttribute(c.name, c.value);
             }
         }
-        zimoli.global(data, this);
+        zimoli.global(src, this);
     }
-    else if (isString(data) || +data < 0) zimoli.go(data, this.params, this);
-};
-var gosrc = function () {
-    var { src } = this;
-    if (this.hasAttribute && this.hasAttribute('src')) {
-        src = this.getAttribute('src');
+    else if (isString(src) || +src < 0) {
+        watch(this, 'params', onparams);
+        onparams.call(this, this.params);
     }
+});
+var gosrc = function (src) {
+    if (!isHandled(this.$src) && !isHandled(src)) return;
     if (src !== this.$src) {
-        change.call(this, src);
         this.$src = src;
+        change.call(this, src);
     }
 };
+var onparams = lazy(function (params) {
+    zimoli.go(this.$src, params, this);
+});
 function container(element) {
     var comment = document.createComment('container');
     comment.$struct = element.$struct;
     care(comment, gosrc);
+    if (element.hasAttribute && element.hasAttribute('src')) {
+        var src = element.getAttribute('src');
+        if (src) oncemount(comment, function () {
+            if ("$src" in this) return;
+            gosrc.call(this, src);
+        });
+    }
     return comment;
 }