efront 4.19.1 → 4.19.3

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

@@ -1,3 +1,18 @@
+- zh-CN: 数据标识不能有“.”符号
+  en:    "Data identification cannot have a '.' symbol"
+
+- zh-CN: 数据不存在！
+  en:    The data does not exist!
+
+- zh-CN: 数据不存在
+  en:    Data does not exist
+
+- zh-CN: 不支持数组格式的数据
+  en:    Data in array format is not supported
+
+- zh-CN: 缺少密码！
+  en:    Missing password!
+
 - zh-CN: 数据标识不能是纯数字
   en:    The data identifier cannot be a pure number
 

package/apps/pivot/api.yml

@@ -19,6 +19,7 @@
   daadd: put /:dbid/
   dbfind: get /:dbid/:last,:size
   dbadd: put /:id
+  daset: post /:dbid/:id
   dbset: post /:id
   dbdel: delete /:id
   dadel: delete /:dbid/:id

package/apps/pivot/db/edit.xht

@@ -39,8 +39,8 @@
 </div>
 
 <lattice body -src="m in items">
-    <padding item>
-        <drop @click="rm(m)"></drop>
+    <padding item @click="modify(m)">
+        <drop @click.stop="rm(m)"></drop>
         <div m.id?></div>
         <div m.name?></div>
     </padding>
@@ -49,20 +49,64 @@
     var [db] = arguments;
     var a = button;
     var items = null;
-    var load = function (params) {
+    var load = function () {
         items = data.from('dbfind', { dbid: db.id, size: 60 });
         return items;
     };
     var rm = async function (m) {
-        var res = await confirm(i18n`确定要删除标识为“${`<span style=color:red >${m.id}</span>`}”的${db.name}“${`<span style='color:red'>${m.name}</span>`}”吗？`, [i18n`确定`, i18n`取消`]);
-        if (!res) return;
+        var options = [i18n`确定`, i18n`取消`];
+        var res = await confirm(i18n`确定要删除标识为“${`<span style=color:red >${m.id}</span>`
+            }”的${db.name}“${`<span style='color:red'>${m.name}</span>`
+            }”吗？`, options);
+        if (res !== options[0]) return;
         await data.from('dadel', { dbid: db.id, id: m.id });
-        return load();
+        await load();
     };
-    var add =async function () {
+    var upload = async function (actionId, d) {
+        if (Array.isArray(d)) return alert(i18n`不支持数组格式的数据`);
+        if (!isObject(d)) return;
+        if (db.id === "用户") {
+            if (!d.id && !d.password) {
+                return alert(i18n`缺少密码！`);
+            }
+            if (d.password) {
+                delete d.password;
+                d.a = encode62.geta(d.password);
+            }
+        }
+        await data.from(actionId, { dbid: db.id, ...d })
+    }
+
+    var modify = async function (m) {
         var elem = document.createElement('jsoncode');
         elem.type = 'json';
         elem.contentEditable = true;
+        elem.setAttribute('nodrag', '');
+        茨菰$编辑框(elem);
+        elem.setValue(JSON.stringify(m, null, 4));
+        var changed = false;
+        await prompt(elem, '输入JSON格式的数据', function (text) {
+            try {
+                JSON.parse(text);
+                return true;
+            } catch (e) {
+                return false;
+            }
+        }, {
+            wrap: true,
+            async submit(text) {
+                var d = JSON.parse(text);
+                await upload("daset", d);
+                changed = true;
+            }
+        });
+        if (changed) load();
+    };
+    var add = async function () {
+        var elem = document.createElement('jsoncode');
+        elem.type = 'json';
+        elem.contentEditable = true;
+        var changed = false;
         await prompt(茨菰$编辑框(elem), '输入JSON格式的数据', function (text) {
             try {
                 JSON.parse(text);
@@ -74,28 +118,16 @@
             wrap: true,
             async submit(text) {
                 var d = JSON.parse(text);
-                var upload = async function (d) {
-                    if (!isObject(d)) return;
-                    if (db.id === '用户') {
-                        if (!d.id && !d.password) {
-                            return alert("缺少密码！");
-                        }
-                        if (d.password) {
-                            delete d.password;
-                            d.a = encode62.geta(d.password);
-                        }
-                    }
-                    await data.from('daadd', { dbid: db.id, ...d })
-                }
                 if (Array.isArray(d)) {
                     while (d.length) {
-                        await upload(d.pop());
+                        await upload('daadd', d.pop());
                     }
                 }
-                else await upload(d);
+                else await upload('daadd', d);
+                changed = true;
             }
         });
-        load();
+        if (changed) load();
     };
-    await load();
+    load();
 </script>

package/coms/basic/data.js

@@ -374,27 +374,27 @@ var parseData = function (sourceText) {
     return sourceText;
 };
 
-function fixApi(api, href) {
-    if (/^\//.test(href)) {
+function fixApi(api, base) {
+    if (/^\/([^\/]|$)/.test(base)) {
         var { protocol, host } = parseURL(location.href);
-        href = protocol + "//" + host + href;
+        base = protocol + "//" + host + base;
     }
-    else if (/^\.\//.test(href)) {
+    else if (/^\.\//.test(base)) {
         var { protocol, host, pathname } = parseURL(document.baseURI || location.href);
-        href = href.slice(1);
-        if (pathname) href = pathname.replace(/\/[^\/\\]*$/, '') + href;
-        href = protocol + "//" + host + href;
+        base = base.slice(1);
+        if (pathname) base = pathname.replace(/\/[^\/\\]*$/, '') + base;
+        base = protocol + "//" + host + base;
     };
     api.transpile = getTranspile(api.url);
     api.url = api.url.replace(/#[\s\S]*$/, '');
     if (!/^\w+?\:\/\//i.test(api.url)) {
-        if (href) {
+        if (base) {
             var paramReg = /(?:\?([\s\S]*?))?(?:#([\s\S]*))?$/, extraSearch, extraHash, search, hash;
-            if (/[\?#]/.test(href)) {
-                [, extraSearch, extraHash] = paramReg.exec(href);
-                href = href.replace(paramReg, '');
+            if (/[\?#]/.test(base)) {
+                [, extraSearch, extraHash] = paramReg.exec(base);
+                base = base.replace(paramReg, '');
             }
-            api.base = href;
+            api.base = base;
             api.path = api.url;
             if (/^\.([\?\#][\s\S]*)?$/.test(api.path)) {
                 api.path = api.path.replace(/^\./, "");
@@ -425,10 +425,10 @@ function createApiMap(data) {
     if (data instanceof ApiMap) return data;
     const apiMap = new ApiMap;
     var hasOwnProperty = {}.hasOwnProperty;
-    var href, _headers;
+    var apibase, _headers;
 
     function checkApi(api) {
-        fixApi(api, href);
+        fixApi(api, apibase);
         if (hasOwnProperty.call(apiMap, api.id)) {
             const lastApi = apiMap[api.id];
             var fmat = api => `[${api.name}](${api.method} ${api.url})`;
@@ -459,7 +459,7 @@ function createApiMap(data) {
             _headers = undefined;
         }
         if (!base) continue;
-        href = reg.test(base) ? base : '';
+        apibase = reg.test(base) ? base : '';
         var item1 = items1[key];
         var items = Object.keys(item1).map(buildItem);
         formulaters.string('id method url name comment', items).map(parseConfig).map(checkApi);

package/coms/compile/unstruct.js

@@ -327,6 +327,7 @@ var _while = function (body, cx, unblock, result) {
     var b = rescan`if (${getCondition(o, unblock, true)}) return []`;
     var be = b[b.length - 1];
     pushstep(result, b);
+    var i2 = result.length - 1;
     relink(result[result.length - 1]);
     var block = getblock(body, ++cx);
     cx += block.length;
@@ -335,7 +336,8 @@ var _while = function (body, cx, unblock, result) {
     var we = wend[wend.length - 1];
     pushstep(result, wend);
     we[0].text = String(1 + i - result.length);
-    be.push(...scanner2(`${result.length - i}, 0`));
+    be.push(...scanner2(`${result.length - i2}, 0`));
+
     relink(be);
     return cx;
 };

package/coms/compile/unstruct_test.js

@@ -161,4 +161,6 @@ test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1,
 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("var res = null, krc;", `res = null; krc`)
-test("res = null, krc;", `res = null; krc`)
+test("res = null, krc;", `res = null; krc`)
+test(`while (a && b);`, '_ = a; if (!_) return [1, 0]; _ = b;\r\n if (!_) return [1, 0]; return [-1, 0]', true);
+test(`while (a < b);`, '_ = a < b; if (!_) return [1, 0]; return [0, 0]', true);

package/coms/zimoli/confirm.js

@@ -143,7 +143,7 @@ function confirm() {
 
     Promise.resolve().then(function () {
         if (isMounted(element)) return;
-        element.mask = true;
+        element.$mask = true;
         popup(element, target || [.5, .5], target ? 'rhomb' : true);
         element.focus();
         if (!target) drag.on(head, element);

package/coms/zimoli/css.js

@@ -164,7 +164,13 @@ var cssTargetSelector = function (targetSelector, oStyle, oValue) {
     });
     for (var k in styleobject) {
         if (!isEmpty(styleobject[k])) {
-            rowStyles.push(k + ":" + transformValue(styleobject[k], k));
+            var o = styleobject[k];
+            if (isArray(o)) {
+                for (var s of o) {
+                    rowStyles.push(k + ":" + transformValue(s, k));
+                }
+            }
+            else rowStyles.push(k + ":" + transformValue(o, k));
         }
     }
     var innerCss = `${targetSelector}{${rowStyles.join(";")}}`;

package/coms/zimoli/popup.js

@@ -80,7 +80,7 @@ var popup_path = function (path = "", parameters, target) {
     }
     var fullfill = function () {
         remove(element);
-        remove(element && element.mask);
+        remove(element && element.$mask);
         element = popup.create(path, parameters);
         if (!element) return;
         load();
@@ -106,7 +106,7 @@ var popup_path = function (path = "", parameters, target) {
 
 var popup_view = function (element, target, style) {
     if (isNode(target)) {
-        if (target.isMask) {
+        if (target.$mask) {
             popup_with_mask(element, target);
             return element;
         }
@@ -115,7 +115,7 @@ var popup_view = function (element, target, style) {
     if (target instanceof Event) {
         popup_to_event(element, target);
     } else if (target instanceof Array) {
-        if (isNode(style) && style.isMask) addMask(element, style);
+        if (isNode(style) && style.$mask) addMask(element, style);
         else if (typeof style === 'boolean') addMask(element);
         popup_to_point(element, target);
     } else if (target) {
@@ -131,13 +131,13 @@ var createMask = function (element) {
     var masks = element.with;
     if (masks) for (var cx = 0, dx = masks.length; cx < dx; cx++) {
         var m = masks[cx];
-        if (m.isMask) return m;
+        if (m.$mask) return m;
     }
     var mask = document.createElement("mask");
     mask.initialStyle = animationStyle;
     css(mask, `z-index:${zIndex()};`);
     mask.className = "mask";
-    mask.isMask = true;
+    mask.$mask = true;
     return mask;
 };
 var mount = function (event) {

package/coms/zimoli/prompt.js

@@ -103,7 +103,7 @@ function prompt() {
             ipt.focus();
         });
     })
-    on("mousedown")(c, e => e.target !== ipt && e.preventDefault() | ipt.focus());
+    on("mousedown")(c, e => !getTargetIn(ipt, e.target) && e.preventDefault() | ipt.focus());
     on(wrap ? "keydown.ctrl.enter" : "keydown.enter")(c, function (event) {
         if (event.defaultPrevented) return;
         event.preventDefault();

package/coms/zimoli/resize.js

@@ -17,7 +17,7 @@ var getResizer = function (event) {
         }
         var target = event.target;
         while (rect && target) {
-            if (target.isMask) break;
+            if (target.$mask) break;
             if (overlap(rect, target) > 0) {
                 if (+getComputedStyle(rect).zIndex < +getComputedStyle(target).zIndex) {
                     rect = null;

package/coms/zimoli/zimoli.js

@@ -45,6 +45,7 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
     backman();
 } else {
     onhashchange(window, function (event) {
+        if (fixurl.ing) return;
         // 如果是返回事件，一定不是第一次改变hash
         // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
         var targetHash = location.hash;

package/coms//350/214/250/350/217/260//346/240/207/347/255/276/345/214/226.js

@@ -63,7 +63,7 @@ var codecolor = function (c, encode) {
         used[k].forEach(k in predefs ? setPredef : setOutside);
     }
     if (c.program) var { space_exp: spaceReg, control_reg } = c.program;
-    if (spaceReg) var unspaceReg = new RegExp(spaces.avoid(), 'g');
+    if (spaceReg) var unspaceReg = new RegExp(`(?:${spaces.avoid()})+`, 'g');
     var wraptext = function (t, l) {
         if (unspaceReg) t = t.replace(unspaceReg, a => {
             a = encode(a);

package/package.json

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