efront 4.5.4 → 4.5.7

package/coms/zimoli/alert.js

@@ -8,13 +8,13 @@ styles.success = styles.pass = styles.green;
 styles.info = styles.blue;
 styles.error = styles.danger = styles.red;
 styles.warn = styles.orange;
-styles.default = '#000a';
+styles.default = '#323436';
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
 var container = document.createElement('alert-container');
 css(container, 'top:0;height:0;left:0;right:0;transition:all 0.2s ease-out;position:absolute;')
-var _text = function (bgcolor, parameters) {
-    var box = document.createElement('div');
+var _text = function (elem, bgcolor, parameters) {
+    var box = elem || document.createElement('div');
     css(box, `background-color:${bgcolor};color:${color.pair(bgcolor, 1)};`);
     box.innerHTML = [].slice.call(parameters, 0).join(", ");
     box.initialStyle = `margin-top:-${fromPixel(singleHeight)};`;
@@ -22,8 +22,10 @@ var _text = function (bgcolor, parameters) {
 };
 function alert() {
     var clr = String(isString(this) && this || styles.default), text, autoclose = true, onclose;
-    [].map.call(arguments, function (arg) {
-        switch (typeof arg) {
+    var setArg = function (args) {
+        text = '';
+        autoclose = true;
+        for (var arg of args) switch (typeof arg) {
             case "string":
             case "object":
                 arg = String(arg);
@@ -48,23 +50,10 @@ function alert() {
             case "function":
                 onclose = arg;
         }
-    });
-    var elem;
-
-    if (color.isColor(clr)) {
-        elem = _text(clr, [text]);
-    } else {
-        elem = _text(styles.log, [text]);
-    }
-    var _onclose = lazy(function (event) {
-        if (onclose) {
-            onclose.call(this, event);
-        }
-        if (close_timer) clearTimeout(close_timer);
-    });
-    onremove(elem, _onclose);
-    var close_timer;
+    };
+    setArg(arguments);
     var waitclose = function (autoclose, deltaTime) {
+        if (close_timer) clearTimeout(close_timer);
         if (autoclose) {
             if (autoclose === true) {
                 autoclose = text && text.length * 160 + deltaTime;
@@ -76,18 +65,30 @@ function alert() {
             }, autoclose);
         }
     };
-    waitclose(autoclose, 400)
-    elem.setText = function (content, timeout = true) {
-        var c = elem;
-        c.innerHTML = content;
-        text = content;
-        if (timeout) {
-            clearTimeout(close_timer);
-            waitclose(timeout, -100);
+    var setContent = function (elem) {
+        if (color.isColor(clr)) {
+            elem = _text(elem, clr, [text]);
+        } else {
+            elem = _text(elem, styles.log, [text]);
+        }
+        if (!container.parentNode) popup(container);
+        if (!elem.parentNode) appendChild(container, elem);
+        waitclose(autoclose, 400);
+        return elem;
+    };
+    var elem = setContent();
+    var _onclose = lazy(function (event) {
+        if (onclose) {
+            onclose.call(this, event);
         }
+        if (close_timer) clearTimeout(close_timer);
+    });
+    onremove(elem, _onclose);
+    var close_timer;
+    elem.setText = function () {
+        setArg(arguments);
+        setContent(elem);
     };
-    if (!container.parentNode) popup(container);
-    if (!elem.parentNode) appendChild(container, elem);
     return elem;
 }
 for (var k in styles) {

package/coms/zimoli/button.less

@@ -316,5 +316,12 @@ a&,
         content: "确认";
     }
 
-    background: #333;
+    &:not(a, .anchor) {
+        background: #333;
+    }
+
+    a&,
+    &.anchor {
+        color: #c26;
+    }
 }

package/coms/zimoli/confirm.js

@@ -1,11 +1,10 @@
 var isOptionalReg = /^是否|是[吗吧]$|[？?]$|请|^难道|^确认/i;
 var conflictReg = /^确[\s\u00a0]*?认[\s\u00a0]*?取[\s\u00a0]*?消/i;
 var defaultOptions = {
-    是: ["是的", "不是"],
-    确认: ["确认", "取消"],
-    是否: ["是", "否"],
-    是吗: ["是", "不是"],
-    请: ["完成", "取消"],
+    是否: ["否", "是"],
+    确认: ["取消", "确认"],
+    是吗: ["不是", "是"],
+    "": [i18n`取消`, i18n`继续`],
 }
 function confirm() {
     var message, title, options, callback, closable = true, selected = -1, target;
@@ -73,8 +72,14 @@ function confirm() {
             }
         }
         if (!options) {
-            options = ["确认 ", "取消"];
+            options = [i18n`取消`, i18n`确认`];
         }
+        options = options.map((label, index) => {
+            if (index === 0) label += '#white';
+            var btn = button(label);
+            btn.result = index;
+            return btn;
+        }).reverse();
     }
     var clickbtn = function (event) {
         event.preventDefault();
@@ -88,7 +93,8 @@ function confirm() {
             if (res instanceof Promise) {
                 element.setAttribute("locked", '');
                 this.setAttribute("loading", "");
-                res.then(() => {
+                res.then((res) => {
+                    element.result = res;
                     remove(element);
                     element.removeAttribute('locked');
                     this.removeAttribute('loading');
@@ -98,27 +104,33 @@ function confirm() {
                 });
             }
             else {
+                element.result = res;
                 remove(element);
             }
         }
         else {
+            element.result = isHandled(this.result) ? this.result : this;
             remove(element);
         }
     };
+    on('remove')(element, function () {
+        this.onload();
+    });
     var buttons = options.map(function (label, index, options) {
         if (isNode(label)) {
             label.index = index;
-            if (isFunction(callback)) onclick(label, clickbtn);
+            onclick(label, clickbtn);
             return label;
         }
         if (options.length === 2) for (var k in defaultOptions) {
-            if (label === defaultOptions[k][1]) {
+            if (label === defaultOptions[k][0]) {
                 label += " #white";
                 break;
             }
         }
         var btn = button(label);
         btn.index = index;
+        btn.result = options[index];
         onclick(btn, clickbtn);
         return btn;
     });
@@ -138,7 +150,7 @@ function confirm() {
             on("blur")(element, blur, true);
         }
     });
-    return element;
+    return awaitable(element, 'result');
 }
 var blur = lazy(function () {
     var element = this;

package/coms/zimoli/model.js

@@ -99,10 +99,13 @@ var constructors = {
     password,
     text: textarea,
     number(e) {
-        var ipt = document.createElement('input');
-        ipt.setAttribute('type', e.field.type);
-        input(ipt);
-        return ipt;
+        var { data, field } = e;
+        var content = `<input type=${field.type} -model=data[field.key] />` + (field.unit ? `<span>${field.unit}</span>` : '');
+        e.innerHTML = content;
+        if (field.unit && field.unit.length <= 6) {
+            e.setAttribute("u" + field.unit.replace(/[\u0080-\ud7ff\uf000-\uffff]/g, '11').length, '')
+        }
+        render(e, { data, field, input });
     },
     generator(elem) {
         var { data, field } = elem;
@@ -113,15 +116,21 @@ var constructors = {
             }
         });
     },
-    date() {
-        var elem = document.createElement("input");
-        elem.type = "date";
-        elem.$renders = [function () {
-            var { data, field } = this.$scope;
-            if (data && field) elem.value = parseDate(data[field.key]);
-        }]
-        input(elem);
-        return elem;
+    date(m) {
+        var { data, field } = m;
+        m.innerHTML = `<input placeholder=${field.holder || '选择日期'} readonly -model=data[field.key] />`;
+        render(m, {
+            data, field, input,
+        });
+        select(m.firstChild, datepicker("年月日", data[field.key]));
+    },
+    datetime(m) {
+        var { data, field } = m;
+        m.innerHTML = `<input placeholder=${field.holder || '选择日期和时间'} readonly -model=data[field.key] />`;
+        render(m, {
+            data, field, input,
+        });
+        select(m.firstChild, datepicker("年月日时分", data[field.key]));
     },
     color() {
         return colorpicker();
@@ -200,7 +209,12 @@ var constructors = {
 
     }
 };
-constructors.price = constructors.money = constructors.number;
+constructors.int
+    = constructors.num
+    = constructors.integer
+    = constructors.price
+    = constructors.money
+    = constructors.number;
 constructors.gen = constructors.generator;
 var readonly_types = {
     "date"({ field }, data) {

package/coms/zimoli/model.less

@@ -1,3 +1,46 @@
-&{
+& {
     word-break: break-all;
-}
+}
+
+&[type=date] {
+    >input {
+        width: 8em;
+        cursor: default;
+    }
+}
+
+&[type=datetime] {
+    >input {
+        width: 10em;
+        cursor: default;
+    }
+}
+
+&[type=int] {
+    >input {
+        text-align: right;
+        width: 8em;
+
+        +span {
+            pointer-events: none;
+        }
+    }
+}
+
+@u(@l) {
+    @w: @{l}em/2 + .5em;
+
+    &[u@l] {
+        >input {
+            margin-right: -@w;
+            padding-right: @w+.2em;
+        }
+    }
+}
+
+@u(1);
+@u(2);
+@u(3);
+@u(4);
+@u(5);
+@u(6);

package/coms/zimoli/selectDate.js

@@ -257,9 +257,9 @@ var render = function (value, models = "年月日", message = "") {
                 if (_index >= models.length) {
                     _index--;
                     preventDefault = false;
-                    container.value = map.call(models, (model, index) => `${value[model]()}${index + 1 < models.length ? value[model].format : ''}`).join("");
-                    dispatch("change", container);
                 }
+                container.value = map.call(models, (model, index) => `${value[model]()}${index + 1 < models.length ? value[model].format : ''}`).join("");
+                dispatch("change", container);
                 break;
             case "val":
                 var val = target.innerText.trim().split(/\s+/);

package/coms/zimoli/view.less

@@ -57,9 +57,7 @@ body>& {
     background: inherit;
     position: relative;
     position: sticky;
-    line-height: 20px;
     overflow: hidden;
-    text-overflow: ellipsis;
     padding: 12px 16px 10px 16px;
 
     &:before {
@@ -133,5 +131,6 @@ body>& {
     a.button {
         display: inline-block;
         padding: 0;
+        margin-right: 6px;
     }
 }

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

@@ -9,9 +9,6 @@
         color: #f24;
     }
 
-    form {
-        padding: 0 0 6px 0;
-    }
 
     form>* {
         margin-right: 16px;
@@ -34,6 +31,33 @@
         background: #069 !important;
     }
 
+    form:after {
+        content: '';
+        display: block;
+        clear: both;
+    }
+
+    form>div {
+        height: 44px;
+        line-height: 42px;
+        padding: 0;
+
+        >input {
+            width: 100%;
+            height: 36px;
+        }
+
+        @media (min-width:800px) {
+            float: right;
+
+            >input {
+                height: 32px;
+                width: 300px;
+            }
+        }
+
+    }
+
     p span,
     p a {
         vertical-align: middle;
@@ -48,9 +72,14 @@
     <button style="float:right" -if="tableData.length" @click="exportCSV">${i18n`导出到文件`}</button>
     <hr />
     <form>
-        <checkbox -src="filters" @change="runFilter"></checkbox>
+        <div>
+            <input -model="searchText" placeholder="${i18n`搜索`}" />
+        </div>
+        <div>
+            <checkbox -src="filters" @change="runFilter"></checkbox>
+        </div>
     </form>
-    <table #table-element -src="[fields,tableData]" @active="showDetail(event)">
+    <table #table-element _find="searchText" -src="filtedData" @active="showDetail(event)">
     </table>
 </div>
 <script>
@@ -347,7 +376,7 @@
     };
     var 已找到的字符串 = [];
     var fields = [
-        { name: i18n`字符串`, key: "text", width: 280 },
+        { name: i18n`字符串`, type: 'text', key: "text", width: 280 },
         { name: i18n`已翻译`, key: "liang", width: 80 },
         { name: i18n`出现文件`, key: "files", width: 200 },
         { name: i18n`出现次数`, key: "count", width: 80 },
@@ -376,7 +405,9 @@
             }
         ].filter(a => !a.disabled)
     };
+    var searchText = '';
     var tableData = [];
+    var filtedData = [fields, tableData];
     var runFilter = function () {
         tableData = 已找到的字符串;
         var { options } = filters;
@@ -385,6 +416,11 @@
                 tableData = tableData.filter(o.test);
             }
         }
+        filtedData = Table.from(fields, tableData);
+        if (searchText) filtedData.search(searchText, function () {
+            render.digest();
+        });
+        console.log(filtedData)
     };
     var detailWindow;
     var detailScope = {
@@ -506,7 +542,7 @@
                     continue;
                 }
                 else {
-                    if (/^[\.]|_test\.js$/i.test(name)) continue;
+                    if (/^[\.]|^node_modules|_test\.js$/i.test(name)) continue;
                     if (e.kind === "file" && !/\.([mc]?[tj]sx?|xht|vue|html?)$/i.test(name)) continue;
                 }
                 e.path = path + e.name;
@@ -553,8 +589,9 @@
                 var liang = 0, fanyi = {};
                 for (var { lang: k, id } of supports) {
                     if (!d[k]) continue;
-                    if (preMap[d[k]] && preMap[d[k]] !== d) continue loop;
-                    if (/\\r/.test(d[k])) console.log(d[k]);
+                    if (preMap[d[k]] && preMap[d[k]] !== d) {
+                        console.log(i18n`发现不同的翻译`, k, preMap[d[k]], d);
+                    }
                     preMap[d[k]] = d;
                     liang++;
                     fanyi[id] = d[k];
@@ -600,8 +637,12 @@
                 accept: { 'text/plain': ['.yml'] },
             }],
         });
+        var msg = alert("正在导出", false);
         var w = await f.createWritable();
+        msg.setText("正在导出.", false);
         await w.write(YAML.stringify(objs));
+        msg.setText("正在导出..", false);
         await w.close();
+        msg.setText(i18n`导出完成`, 'success')
     };
 </script>

package/package.json

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