efront 4.4.12 → 4.4.14

package/coms/zimoli/grid.js

@@ -335,7 +335,7 @@ var createPoints = function (values, direction = "x", result = new Point(0)) {
     for (var cx = 0, dx = values.length; cx < dx; cx++) {
         var value = values[cx];
         if (value instanceof Array && value.constructor !== Point) {
-            if (!result.length) throw new Error("数据转换为grid失败！");
+            if (!result.length) throw new Error(i18n`数据转换为grid失败！`);
             createPoints(value, direction === "x" ? "y" : "x", result[result.length - 1]);
         } else {
             var breakpoint = new Point(value);
@@ -401,7 +401,7 @@ var grid_prototype = {
                 targetX = clientX = left + right >> 1;
                 break;
             default:
-                throw new Error("参数不支持", side);
+                throw new Error(i18n`参数不支持`, side);
         }
         this.direction = direction;
         var e = resizer.call(this, { clientX, clientY, target: cell });
@@ -690,7 +690,7 @@ var createPointsFromElements = function (elements, xList, yList) {
             var y1 = yList[cx - 1];
             var y2 = yList[cx];
             var temp = elements.filter(e => e[3] >= y1 && e[4] <= y2);
-            if (temp.length === elements.length) throw new Error("遇到不规则布局，无法自动处理！");
+            if (temp.length === elements.length) throw new Error(i18n`遇到不规则布局，无法自动处理！`);
             if (temp.length > 1) {
                 var children = createPointsFromElements(temp, [xList[0], xList[xList.length - 1]], [y1, y2]);
                 if (children.length) {
@@ -711,7 +711,7 @@ var createPointsFromElements = function (elements, xList, yList) {
             var x1 = xList[cx - 1];
             var x2 = xList[cx];
             var temp = elements.filter(e => e[1] >= x1 && e[2] <= x2);
-            if (temp.length === elements.length) throw new Error("遇到不规则布局，无法自动处理！");
+            if (temp.length === elements.length) throw new Error(i18n`遇到不规则布局，无法自动处理！`);
             if (temp.length > 1) {
                 var children = createPointsFromElements(temp, [x1, x2], [yList[0], yList[yList.length - 1]]);
                 if (children.length) xList.splice(cx, 0, children);

package/coms/zimoli/icon.js

@@ -1,4 +1,4 @@
-console.error("图标组件的服务端已从efront移除，请勿使用！");
+console.error(i18n`图标组件的服务端已从efront移除，请勿使用！`);
 var setBackGround, icon, icn;
 var binaryImagePathReg = /^https?\:|\.(?:png|gif|bmp|jpe?g)$/i;
 if (/MSIE\s*[2-8]/.test(navigator.userAgent)) {

package/coms/zimoli/list.js

@@ -190,7 +190,7 @@ function ylist(container, generator, $Y) {
             }
             offsetBottom = bottom_item.offsetTop + bottom_item.offsetHeight;
             ratioTop = top_item.offsetTop + top_item.offsetHeight * ratio;
-            if (count++ > 600) throw new Error("多于600个元素需要绘制！");
+            if (count++ > 600) throw new Error(i18n`多于600个元素需要绘制！`);
         }
         for (var k in childrenMap) {
             remove(childrenMap[k]);

package/coms/zimoli/mediaDevices.js

@@ -30,7 +30,7 @@ var load = function () {
     });
 }
 if (!_mediaDevices) {
-    console.info("当前环境不支持mediaDevices！");
+    console.info(i18n`当前环境不支持mediaDevices！`);
 } else {
     _mediaDevices.ondevicechange = load;
     load();

package/coms/zimoli/menu.js

@@ -197,7 +197,7 @@ function main(elem, mode) {
                 }
                 break;
             default:
-                throw new Error(`不支持的菜单类型：${mode}`);
+                throw new Error(i18n`不支持的菜单类型：${mode}`);
         }
     } else {
         mode = mode || "horizonal";

package/coms/zimoli/on.js

@@ -199,7 +199,7 @@ var parseEventTypes = function (eventtypes) {
                         types.keyCode = keyCodeMap[t];
                     }
                     else {
-                        throw new Error(`绑定事件参数无效${t}`);
+                        throw new Error(i18n`绑定事件参数无效${t}`);
                     }
 
             }
@@ -315,7 +315,7 @@ var checkroot = function (element, k) {
         if (element === window && k in document) {
             element = document;
             // <!--
-            if (!checkroot[k]) checkroot[k] = true, console.warn("使用 document 的", k, "替代 window 的");
+            if (!checkroot[k]) checkroot[k] = true, console.warn(i18n`使用 document 的`, k, "替代 window 的");
             // -->
         }
     }
@@ -365,7 +365,7 @@ var on = document.efronton = function (k) {
     else {
         var _addhandler = function (target, context, handler, firstmost = false) {
             if (eventtypes.capture) {
-                console.warn("当前运行环境不支持事件capture");
+                console.warn(i18n`当前运行环境不支持事件capture`);
                 firstmost = true;
             }
             target = checkroot(target, k);

package/coms/zimoli/overlap_test.js

@@ -3,7 +3,7 @@ addClass(sample, "overlap-test");
 css(".overlap-test", "position:absolute;z-index:10;");
 var assert = function (a, b) {
     if (a !== b) return console.error(`${a} is not equal ${b}!`), 0;
-    else return console.info("验证通过"), 1;
+    else return console.info(i18n`验证通过`), 1;
 }
 var getElement = function (left, top, width, height) {
     var element1 = createElement(sample)

package/coms/zimoli/popup.js

@@ -24,10 +24,10 @@ var popup = function (path) {
     if (isNode(path)) {
         return popup_view.apply(null, arguments);
     }
-    throw new Error(`参数异常:${path}`);
+    throw new Error(i18n`参数异常:${path}`);
 };
 var popup_path = function (path = "", parameters, target) {
-    if (!popup.go || !popup.prepare) throw new Error("当前环境无法使用");
+    if (!popup.go || !popup.prepare) throw new Error(i18n`当前环境无法使用`);
     // 3 has mask has view control
     var element;
     if (/^[#\+]/.test(path)) {

package/coms/zimoli/render.js

@@ -209,7 +209,7 @@ var createRepeat = function (search, id = 0) {
     // throw new Error("repeat is not supported! use list component instead");
     var expression = search;
     var repeater = parseRepeat(expression);
-    if (!repeater) throw new Error(`不能识别循环表达式: ${expression} `);
+    if (!repeater) throw new Error(i18n`不能识别循环表达式: ${expression} `);
     var { srcName, trackBy } = repeater;
     // 懒渲染
     var getter = createGetter(this, srcName);
@@ -227,7 +227,7 @@ var createRepeat = function (search, id = 0) {
         var isArrayResult = result instanceof Array;
         var keys = isArrayResult ? result.map((_, i) => i) : Object.keys(result);
         if (keys.length > 600) {
-            throw new Error("数据量过大，取消绘制！");
+            throw new Error(i18n`数据量过大，取消绘制！`);
         }
         var $parentScopes = element.$parentScopes || [];
         var $struct = element.$struct;
@@ -327,7 +327,7 @@ var createIf = function (search, id = 0) {
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     var repeater = parseRepeat(repeatExpression);
     if (!repeater) {
-        throw new Error(`不能识别循环表达式：${repeat}`);
+        throw new Error(i18n`不能识别循环表达式: ${repeat}`);
     }
     var pair = [];
     var rest = [], savedIndex = 0;
@@ -359,7 +359,7 @@ var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     };
     var inc = 0;
     while (reg.lastIndex < ifExpression.length) {
-        if (inc++ > 100) throw new Error("请不要在if表达式中使用太多的条件!");
+        if (inc++ > 100) throw new Error(i18n`请不要在if表达式中使用太多的条件!`);
         if (reg.lastIndex < savedIndex) break;
         run();
     }
@@ -423,7 +423,7 @@ var structures = {
             if (if_top[cx].parent === this.parentNode) break;
         }
         if (cx < 0) {
-            throw new Error("else/elseif前缺少同级if！");
+            throw new Error(i18n`else/elseif前缺少同级if！`);
         }
         initIf(if_top.splice(cx + 1, if_top.length - cx - 1));
         var top = if_top[cx];
@@ -757,11 +757,11 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         element.$renderid = 0;
         element.$scope = scope;
         if (isHandled(parentScopes) && !isArray(parentScopes)) {
-            throw new Error('父级作用域链应以数组的类型传入');
+            throw new Error(i18n`父级作用域链应以数组的类型传入`);
         }
         if (parentScopes) {
             if (element.$renderid && !element.$parentScopes || element.$parentScopes && element.$parentScopes.length !== parentScopes.length) {
-                throw new Error("父作用域链的长度必须相等着");
+                throw new Error(i18n`父作用域链的长度必须相等着`);
             }
         }
         element.$parentScopes = parentScopes || [];
@@ -775,7 +775,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         return element;
     }
     for (var id of element.$struct.ids) {
-        if (scope[id] && scope[id] !== element) throw new Error("同一个id不能使用两次:" + id);
+        if (scope[id] && scope[id] !== element) throw new Error(i18n`同一个id不能使用两次:` + id);
         scope[id] = element;
     }
     var isFirstRender = !element.$renderid;
@@ -937,11 +937,11 @@ function createStructure(element) {
             if (element.$renderid <= -2) {
                 if (/^if$|^else/i.test(key)) {
                     if (types.if) {
-                        throw new Error(`暂不支持在同一元素上使用多次if结构!`);
+                        throw new Error(i18n`暂不支持在同一元素上使用多次if结构!`);
                     }
                 } else {
                     if (types.repeat) {
-                        throw new Error(`暂不支持在同一元素上使用多次repeat类型的属性!`);
+                        throw new Error(i18n`暂不支持在同一元素上使用多次repeat类型的属性!`);
                     }
                 }
             }

package/coms/zimoli/table.js

@@ -471,7 +471,7 @@ function table(elem) {
         else if (src instanceof Array) {
             var [fields, data] = src;
         }
-        else throw new Error("table组件源数据错误！");
+        else throw new Error(i18n`table组件源数据错误！`);
         if (_vbox) _vbox(), _vbox = null;
         watch(table, {
             find(text) {

package/coms/zimoli/watch.js

@@ -21,6 +21,6 @@ function watch(elem, prop, handler) {
             if (!isFunction(prop[k])) e++;
             else elem.$watches[k] = prop[k];
         }
-        if (e > 0) throw new Error("参数不支持！");
+        if (e > 0) throw new Error(i18n`参数不支持！`);
     }
 }

package/coms/zimoli/zimoli.js

@@ -96,7 +96,7 @@ var getZimoliParams = function (pagepath) {
     try {
         return JSAM.parse(hostoryStorage.getItem(_zimoli_params_key + pagepath)) || {};
     } catch (e) {
-        console.warn("存储空间被破坏");
+        console.warn(i18n`存储空间被破坏`);
     }
     return {};
 };
@@ -106,7 +106,7 @@ var setZimoliParams = function (pagepath, args) {
         if (stringified_args.length === 2) hostoryStorage.removeItem(_zimoli_params_key + pagepath);
         else hostoryStorage.setItem(_zimoli_params_key + pagepath, stringified_args);
     } catch (e) {
-        console.warn("写入存储空间失败！", e);
+        console.warn(i18n`写入存储空间失败！`, e);
     }
 };
 var fullfill_is_dispatched = 0;
@@ -391,7 +391,7 @@ function create(pagepath, args, from, needroles) {
     if (typeof pagepath === 'string') {
         var page_object = page_generators[pagepath];
         if (!page_object) {
-            throw new Error(`调用create前请确保prepare执行完毕:${pagepath}`);
+            throw new Error(i18n`调用create前请确保prepare执行完毕:${pagepath}`);
         }
         var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
     }

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -340,7 +340,7 @@
             return compile$translate.getI18nPrefixed(code);
         }
         catch (e) {
-            alert("提取文本时存在异常", "error");
+            alert(i18n`提取文本时存在异常`, "error");
             console.error(e, f.path);
             return [];
         }
@@ -356,6 +356,14 @@
         key: "filter",
         options: [
             {
+                name: i18n`过滤空串`,
+                checked: true,
+                test(a) {
+                    return !!a.fanyi || /\S/.test(a.text);
+                }
+            },
+            {
+                disabled: true,
                 name: i18n`只看中文`, key: "cnonly", get checked() {
                     return true;
                 },
@@ -366,7 +374,7 @@
                     return !!a.fanyi || /[\u3400-\ufad9\u{20000}-\u{2a6d6}\u{2fa1d}]/u.test(a.text);
                 }
             }
-        ]
+        ].filter(a => !a.disabled)
     };
     var tableData = [];
     var runFilter = function () {
@@ -481,7 +489,7 @@
     }
     var chooseFolder = async function () {
         var dp = await window.showDirectoryPicker();
-        var msg = alert("正在读取文件列表，请稍候..", false);
+        var msg = alert(i18n`正在读取文件列表，请稍候..`, false);
         var rest = [dp];
         var result = [];
         dp.path = "";
@@ -511,7 +519,7 @@
                 }
             }
         }
-        msg.setText("正在提取字符串..");
+        msg.setText(i18n`正在提取字符串..`);
         css(msg.firstElementChild, 'text-align:left');
         var textMap = Object.create(null);
         已找到的字符串.is_loading = true;

package/package.json

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