npm - efront - Versions diffs - 3.26.8 → 3.26.15 - Mend

efront 3.26.8 → 3.26.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/LICENSE +2 -0
package/apps/index.jsp +2 -2
package/apps/pivot/dht/list.js +53 -0
package/apps/pivot/index.html +3 -1
package/apps/pivot/main.js +1 -0
package/apps/pivot/main.less +3 -0
package/apps/pivot/wow/root.js +138 -104
package/apps/pivot/wow/root.less +1 -62
package/coms/basic/Task.js +51 -0
package/coms/basic/cross_.js +8 -0
package/coms/basic/keys.js +3 -4
package/coms/basic/loader.js +42 -17
package/coms/basic/submit_.js +6 -3
package/coms/explorer/Explorer.js +85 -0
package/coms/explorer/context.js +205 -0
package/coms/explorer/deepcp.js +48 -0
package/{apps/pivot/wow → coms/explorer}/edit.html +1 -1
package/{apps/pivot/wow → coms/explorer}/edit.js +17 -9
package/coms/explorer/fileitem.html +8 -0
package/coms/explorer/fileitem.js +34 -0
package/coms/explorer/fileitem.less +65 -0
package/coms/explorer/filetip.js +10 -0
package/coms/explorer/filetip.less +5 -0
package/coms/explorer/main.html +8 -0
package/coms/explorer/main.js +215 -0
package/coms/explorer/main.less +78 -0
package/coms/frame/route.js +1 -1
package/coms/shapes/file.html +9 -0
package/coms/shapes/folder.html +7 -0
package/coms/zimoli/Cleanup.js +9 -8
package/coms/zimoli/arriswise.js +5 -4
package/coms/zimoli/attr.js +2 -0
package/coms/zimoli/bindGlobalkey.js +37 -0
package/coms/zimoli/confirm.js +8 -8
package/coms/zimoli/confirm.less +6 -80
package/coms/zimoli/container.js +19 -6
package/coms/zimoli/contextmenu.js +35 -15
package/coms/zimoli/drag.js +7 -3
package/coms/zimoli/field.html +1 -1
package/coms/zimoli/field.js +8 -2
package/coms/zimoli/field.less +0 -1
package/coms/zimoli/getChanges.js +1 -0
package/coms/zimoli/list.js +44 -33
package/coms/zimoli/menu.js +1 -24
package/coms/zimoli/menuItem.html +4 -1
package/coms/zimoli/menuList.js +54 -104
package/coms/zimoli/menuList.less +1 -0
package/coms/zimoli/moveupon.js +2 -2
package/coms/zimoli/overpos.js +7 -0
package/coms/zimoli/popup.js +22 -27
package/coms/zimoli/prompt.js +43 -5
package/coms/zimoli/prompt.less +23 -0
package/coms/zimoli/render.js +153 -109
package/coms/zimoli/resize.js +17 -7
package/coms/zimoli/rootElements.js +15 -1
package/coms/zimoli/view.js +33 -0
package/coms/zimoli/view.less +8 -8
package/coms/zimoli/yousure.js +53 -0
package/coms/zimoli/yousure.less +4 -0
package/coms/zimoli/zimoli.js +10 -6
package/package.json +1 -1
package/public/efront.js +1 -1
package/apps/pivot/wow/root.html +0 -10
package/coms/zimoli/explorer.html +0 -5
package/coms/zimoli/explorer.js +0 -8
package/coms/zimoli/explorer.less +0 -18
package/coms/zimoli/explorer_test.js +0 -4

package/LICENSE CHANGED Viewed

@@ -18,3 +18,5 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+共产党与狗不得使用

package/apps/index.jsp CHANGED Viewed

@@ -115,11 +115,11 @@
                     })
                 });
-                rows.push(`<a href="${n}?${stats.mtime.toLocaleDateString()}" target=_blank ><b name>${n}</b><span time>${stats.mtime.toLocaleDateString()}</span></a>`);
+                rows.push(`<a href="${n}?${stats.mtime.toLocaleDateString()}" ><b name>${n}</b><span time>${stats.mtime.toLocaleDateString()}</span></a>`);
             }
             return rows.join('')
         </script>
-        <a href="https://www.npmjs.com/package/efront">
+        <a href="https://www.npmjs.com/package/efront" target="_blank">
             <b name>efront</b>
             <span time>&nbsp;</span>
         </a>

package/apps/pivot/dht/list.js ADDED Viewed

@@ -0,0 +1,53 @@
+function hash(a) {
+    var r = [];
+    for (var cx = 0, dx = a.length; cx < dx; cx += 20) {
+        r.push(a.slice(cx, cx + 20).split("").map(a => a.charCodeAt().toString(16)).join(""));
+    }
+    return r;
+}
+var fields = refilm`名称/name
+服务器/host
+端口/port
+`;
+return plist.bind({
+    fields,
+    type: 'nodes',
+    title: "DHT服务器管理",
+    buttons: [{
+        name: "从文件读取", async do() {
+            var FileReader = window.FileReader;
+            if (!FileReader) return alert('当前浏览器无法读取文件', 'warn')
+            var f = await chooseFile(".torrent",true);
+            var pg = await popup("/dht/rent");
+            pg.$scope.pending = true;
+            for (var f of f) await new Promise(function (ok, oh) {
+                var r = new FileReader;
+                r.onload = function () {
+                    try {
+                        var t = bdecode2(r.result);
+                    } catch (e) {
+                        return;
+                    }
+                    pg.$scope.load(t);
+                    pg.$scope.pending = false;
+                    ok();
+                };
+                r.onerror = function () {
+                    alert("读取文件失败！", 'error');
+                    oh();
+                };
+                r.readAsArrayBuffer(f);
+            });
+            console.log(pg.$scope.pending)
+        }
+    }]
+})
+// function main() {
+//     var page = document.createElement('div');
+//     page.innerHTML = template;
+//     return renderWithDefaults(page, {
+//         torrents: [],
+//         async rent() {
+//         }
+//     })
+// }

package/apps/pivot/index.html CHANGED Viewed

@@ -36,6 +36,8 @@
     </style>
 </head>
-<body scroll=no menu="menu.yml"></body>
+<body scroll=no menu="menu.yml">
+    雪下的那么深，下的那么认真..
+</body>
 </html>

package/apps/pivot/main.js CHANGED Viewed

@@ -82,6 +82,7 @@ on("dragover")(document, function (event) {
 on("drop")(document, function (event) {
     event.preventDefault();
 });
+remove(document.body.childNodes);
 function main() {
     return layer;
 }

package/apps/pivot/main.less CHANGED Viewed

@@ -2,4 +2,7 @@
     padding: 50px 10px 0;
     min-height: 100%;
     display: block;
+}
+&{
+    user-select: none;
 }

package/apps/pivot/wow/root.js CHANGED Viewed

@@ -2,128 +2,162 @@ var fields = refilm`
 文件
 `;
 var passport = encode62.timeencode(encode62.decode62(user._passport, user.session));
-async function upload(f, base) {
-    var api = await data.getApi('upload');
-    var authorization = await data.getSource(api.base);
-    var xhr = cross(api.method, api.base + base + f.name, { authorization: authorization });
-    xhr.setRequestHeader('range', 'bytes=1-' + f.size);
-    return xhr.send(f);
-}
-function main() {
-    async function uploadAll(files) {
-        await queue.call(files, function (f) {
-            return upload(f, page.$scope.pathlist.join("/"));
+var pending = [];
+async function upload(f, dist, token) {
+    var api = await data.getApi("upload");
+    var p = {};
+    if (token) {
+        var { base, authorization } = token;
+        var start = f.start || 0;
+        var end = start + f.size - 1;
+        var xhr = cross(api.method, base + dist, { authorization });
+        xhr.setRequestHeader('range', `bytes=${start}-${end}`);
+        xhr.send(f.data);
+        var p = { url: base + dist, percent: f.start / f.total, abort: xhr.abort.bind(xhr) };
+        pending.push(p);
+        xhr.error(function (e) {
+            alert.error(e);
+        });
+        render.refresh();
+        await xhr;
+        removeFromList(pending, p);
+    }
+    else {
+        var authorization = data.getSource(api.base);
+        /**
+         * @type {XMLHttpRequest}
+         */
+        var xhr = cross(api.method, dist + f.name, { authorization });
+        var p = { percent: 0, pending: true, name: f.name, folder: dist, abort: xhr.abort.bind(xhr) };
+        dist = dist.replace(/^\/+|\/+$/g, '');
+        if (dist) p.url = api.base + dist + "/" + f.name;
+        else p.url = api.base + f.name;
+        this.data.push(p);
+        pending.push(p);
+        xhr.upload.onprogress = function ({ loaded, total }) {
+            p.percent = loaded / total;
+            render.refresh();
+        };
+        xhr.send(f);
+        xhr.error((e) => {
+            alert.error(e);
+            removeFromList(this.data, p);
+            removeFromList(pending, p);
         });
-        page.$scope.open();
+        await xhr;
+        removeFromList(this.data, p);
+        removeFromList(pending, p);
+    }
+    return xhr;
+}
+var copyed = null;
+class File {
+    constructor(f) {
+        var isfolder = /\/$/.test(f);
+        this.name = f.replace(/\/+$/, '');
+        this.isfolder = isfolder;
+        this.type = isfolder ? 'folder' : 'file';
+    }
+    get pending() {
+        for (var p of pending) {
+            if (p.url.indexOf(this.url) === 0) {
+                this.percent = p.percent;
+                return p;
+            }
+        }
+        return false;
+    }
+    abort() {
+        var p = this.pending;
+        if (!p) return;
+        p.abort();
     }
-    var page = div();
-    page.innerHTML = root;
+}
+function main() {
+    var page = explorer$main();
+    var backtime = 0;
     page.onback = function () {
         var $scope = this.$scope;
         if (!$scope.pathlist.length) {
-            return;
+            if (Date.now() - backtime < 2022) alert("已是根目录！");
+            backtime = Date.now();
+            return false;
+        }
+        if ($scope.pathlist) {
+            var name = $scope.pathlist.pop();
+            var base = data.getInstance("base").base;
+            var p = $scope.pathlist.join("/").replace(/^\/+|\/+$/g, '');
+            var bp = p ? base + p + '/' : base;
+            p = p + '/';
+            data.setInstance("pathlist", $scope.pathlist);
+            name = name.replace(/^\/+|\/+$/g, '');
+            $scope.selected = [{
+                name,
+                isfolder: true,
+                where: p,
+                host: base,
+                url: bp + name + "/",
+                fullpath: p + name + "/",
+                type: 'folder'
+            }];
         }
-        data.setInstance("pathlist", $scope.pathlist.slice(0, -1));
         $scope.open();
         return false;
     }
-    page.setAttribute('on-contextmenu', 'setActive')
-    bind('drop')(page, async function (event) {
-        event.preventDefault();
-        var files = event.dataTransfer.files;
-        uploadAll(files);
-    });
-    renderWithDefaults(page, {
-        lattice,
+    extend(page.$scope, {
         pathlist: data.getInstance("pathlist"),
-        active: null,
-        open(p) {
-            if (p && !/\/$/.test(p.name)) {
-                // window.open("/" + this.pathlist.concat(p.name).join('/'))
-                return;
-            }
-            if (p) p = String(p.name || '').replace(/\/$/, '');
-            if (p) data.setInstance("pathlist", this.pathlist.concat(p));
-            this.data = data.from("folder", { opt: 'list', path: encode62.timeencode("/" + this.pathlist.join('/')) }, files => {
-                if (files) return sortname(files).map(f => {
-                    return {
-                        name: f,
-                        type: /\/$/.test(f) ? 'folder' : 'file'
-                    }
+        read(from, start, size) {
+            var authorization = data.getSource(data.getInstance("base").base);
+            var xhr = cross("get", from.url, { authorization: authorization });
+            var end = start + size - 1;
+            xhr.setRequestHeader('range', `bytes=${start}-${end}`);
+            xhr.send();
+            return xhr;
+        },
+        load(p) {
+            data.setInstance("pathlist", this.pathlist);
+            var base = data.getInstance("base").base;
+            var p = p.replace(/^\/+|\/+$/g, '');
+            var bp = p ? base + p + "/" : base;
+            p = p + '/';
+            return data.from("folder", { opt: 'list', path: encode62.timeencode(p) }, files => {
+                if (files) return files.map(f => {
+                    var file = new File(f);
+                    file.host = base;
+                    file.where = p;
+                    file.url = bp + f;
+                    file.fullpath = p + f;
+                    return file;
                 });
             });
         },
-        setActive(e) {
-            this.active = getActive(e);
+        async getToken() {
+            var api = await data.getApi('upload');
+            var authorization = await data.getSource(api.base);
+            return { authorization, base: api.base };
         },
-        data: [],
-    });
-    page.$scope.open();
-    var getActive = e => {
-        var p = page.querySelector('lattice');
-        var t = getTargetIn(e => e.parentNode && e.parentNode.parentNode === p, e.target);
-        return t;
-    };
-    var when = e => !!getActive(e);
-    var popupEdit = function (e) {
-        zimoli.prepare('/wow/edit', function () {
-            var p = popup("#/wow/edit", {
-                path: page.$scope.pathlist,
-                name: e || ''
-            });
-            on('submited')(p, function () {
-                page.$scope.open();
-                remove(p);
-            });
-        })
-    };
-    contextmenu(page, [
-        {
-            name: "新建文件夹",
-            when: e => !getActive(e),
-            do() {
-                popupEdit();
-            }
+        upload,
+        async delete(path) {
+            return data.from("folder", { opt: 'del', path: encode62.timeencode(path) })
         },
-        {
-            name: "添加文件",
-            when: e => !getActive(e),
-            do() {
-                return chooseFile().then(uploadAll);
-            }
+        async rename(from, to) {
+            from = encode62.timeencode(from);
+            to = encode62.timeencode(to);
+            await data.from("folder", { opt: 'mov', path: from, to }).loading_promise;
         },
-        {
-            name: '重命名',
-            when,
-            do(e) {
-                popupEdit(e.$scope.d.name);
-            }
+        async add(name) {
+            name = encode62.timeencode(name);
+            await data.from("folder", { opt: 'add', path: name }).loading_promise;
         },
-        {
-            get name() {
-                return this.confirm ? "确认删除" : "删除";
-            },
-            confirm: false,
-            when(e) {
-                this.confirm = false;
-                return when(e);
-            },
-            type: "danger",
-            async do(e) {
-                if (!this.confirm) {
-                    this.confirm = true;
-                    setTimeout(_ => {
-                        this.confirm = false;
-                        render.refresh();
-                    }, 2000);
-                    return false;
-                }
-                await data.from("folder", { opt: 'del', path: encode62.timeencode("/" + page.$scope.pathlist.concat(e.$scope.d.name).join("/")) }).loading_promise;
-                page.$scope.open();
-            }
+        async mov(from, distpath) {
+            var currentHost = data.getInstance("base").base;
+            if (from.host !== currentHost) return alert("暂不支持跨服务器操作！");
+            from = encode62.timeencode(from.fullpath);
+            distpath = encode62.timeencode(distpath);
+            await data.from("folder", { opt: 'mov', path: from, to: distpath }).loading_promise;
         }
-    ]);
+    });
+    page.$scope.open();
     return page;
 }

package/apps/pivot/wow/root.less CHANGED Viewed

@@ -1,63 +1,2 @@
-& {
-    height: 100%;
-}
-@height: 44px;
->lattice {
-    box-sizing: content-box;
-    margin-top: -@height;
-    padding-top: @height + 6px;
-    a {
-        vertical-align: top;
-    }
-}
-padding {
-    border-right-width: 60px;
-}
->.address {
-    position: relative;
-    z-index: 3;
-    margin-left: 140px;
-    margin-top: -@height - 6px;
-    height: @height;
-    padding: 0 6px;
-    line-height: @height;
-    input {
-        width: 100%;
-    }
-}
-item {
-    border: 1px solid #0002;
-    position: relative;
-    display: block;
-    padding: 10px 20px;
-    &:hover {
-        outline: 2px solid #2cf;
-    }
-    &:active {
-        color: #28c;
-        outline: 2px solid;
-    }
-    &.focus {
-        color: #28c;
-        outline: 2px solid;
-    }
-    >a {
-        vertical-align: top;
-    }
-    >[op] {
-        left: 6px;
-        margin-left: 6px;
-    }
+&{
 }

package/coms/basic/Task.js ADDED Viewed

@@ -0,0 +1,51 @@
+var alltasks = Object.create(null);
+class Task {
+    static get alltasks() { return alltasks; };
+    rest = [];
+    percent = 0;
+    aborted = false;
+    complete = true;
+    open(type, load) {
+        this.type = type;
+        this.load = load;
+    }
+    async loop() {
+        if (typeof this.load === "function") while (!this.aborted && this.rest.length) {
+            this.percent = 0;
+            await this.load(this.rest.pop());
+        }
+        this.percent = 100;
+    }
+    async send(data) {
+        this.rest.push(data);
+        if (!this.complete) return;
+        this.mount();
+        try {
+            this.complete = false;
+            await Promise.resolve().then(() => this.loop());
+            this.complete = true;
+            if (typeof this.onload === 'function') this.onload();
+        }
+        catch (e) {
+            if (typeof this.onerror === 'function') this.onerror(e);
+        }
+        this.unmount();
+    }
+    mount() {
+        var type = this.type;
+        if (!alltasks[type]) alltasks[type] = [];
+        alltasks[type].push(this);
+    }
+    unmount() {
+        if (!alltasks[this.type]) return;
+        removeFromList(alltasks[this.type], this);
+        if (!alltasks[this.type].length) delete alltasks[this.type];
+    }
+    abort() {
+        this.aborted = true;
+        this.unmount();
+    }
+}
+module.exports = Task;

package/coms/basic/cross_.js CHANGED Viewed

@@ -308,6 +308,14 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 cachedata.push({ [data]: value });
             }
             else if (!isEmpty(data)) {
+                if (!cachedata.length) {
+                    if (File && data instanceof File || typeof data === 'string') {
+                        datas = data;
+                    }
+                }
+                else {
+                    datas = '';
+                }
                 cachedata.push(data);
             }
             return xhr;

package/coms/basic/keys.js CHANGED Viewed

@@ -1,6 +1,5 @@
 function keysFrom() {
-    var args = [].slice.call(arguments, 0, arguments.length);
+    var args = Array.prototype.slice.call(arguments, 0, arguments.length);
     args.unshift(Object.create(null));
-    return Object.keys(extend.apply(null, args));
-}
-var main = keysFrom;
+    return Object.keys(extendIfNeeded.apply(null, args));
+}

package/coms/basic/loader.js CHANGED Viewed

@@ -75,7 +75,7 @@ var flushTree = function (tree, key, res) {
         for (var cx = 0, dx = response.length; cx < dx; cx++) {
             var call = response[cx];
             if (call instanceof Function) {
-                call(response.error);
+                call(response.error ? key : null);
             }
         }
     }
@@ -84,13 +84,13 @@ var readingCount = 0;
 var readFile = function (names, then) {
     if (names instanceof Array) {
         names = names.slice(0);
-        var loaded = 0, errored = 0;
+        var loaded = 0, errored = [];
         var callback = function (e) {
             if (e) {
-                errored++;
+                errored.push(name);
             }
             if (++loaded === names.length) {
-                then(errored);
+                then(errored.length ? errored : null);
             }
         };
         if (!names.length) return then();
@@ -150,7 +150,7 @@ var readFile = function (names, then) {
             }
         }
         loadingTree[key].error = e;
-        loadingTree[key].forEach(a => a(1));
+        loadingTree[key].forEach(a => a(e));
     };
     var tryload = function () {
         request(url, ok, oh, version);
@@ -169,8 +169,9 @@ var killCircle = function () {
     for (var k in loadedModules) {
         if (k.slice(0, keyprefix.length) === keyprefix && loadedModules[k] instanceof Array) {
             var key = k.slice(keyprefix.length);
-            var args = loadedModules[k].args;
             if (!(loadedModules[k] instanceof Array)) continue;
+            var args = loadedModules[k].args;
+            if (!(args instanceof Array)) continue;
             args.forEach(arg => {
                 if (!penddings[arg]) {
                     penddings[arg] = [];
@@ -292,20 +293,16 @@ var loadModule = function (name, then, prebuilds = {}) {
             mod.required = required;
             mod.file = name;
             args = args.concat(required);
-            var _errored = 0;
+            var _errored = [];
             var response = function (error) {
                 loadingCount++;
                 if (error) {
-                    if (!errored[error]) {
-                        errored[error] = [];
-                    }
+                    if (!errored[error]) errored[error] = [];
                     errored[error].push(key);
-                    _errored++;
+                    _errored.push(error);
                 }
                 if (loadingCount === args.length) {
-                    if (_errored.length) {
-                        loadedModules[key].error = true;
-                    }
+                    if (_errored.length) loadedModules[key].error = _errored;
                     flushTree(loadedModules, key, mod);
                 }
             };
@@ -602,8 +599,35 @@ var init = function (name, then, prebuilds) {
         res.errored = true;
         res.error = error;
         res.fire();
-        console.error(`加载${name}失败，${ed && ed.length ? `${ed.join(', ')} 等${ed.length}个模块` : "没有其他模块"}受到影响`);
-        if (window.document) throw error;
+        var rest = [name];
+        var track = [];
+        var length = 0;
+        var deep = 0;
+        // <!--
+        var map = Object.create(null);
+        map[name] = true;
+        do {
+            deep++;
+            var rest2 = Object.create(null);
+            while (rest.length) {
+                var n = rest.pop();
+                var e = loadedModules[n] && loadedModules[n].error;
+                if (e instanceof Array) {
+                    track.push([deep, n, e]);
+                    if (n.length + deep > length) length = n.length + deep;
+                    for (var e of e) if (!map[e]) rest2[e] = true, map[e] = true;
+                }
+                else {
+                    if (n.length + deep > length) length = n.length + deep;
+                    track.push([deep, n, [e]]);
+                }
+            }
+            rest = Object.keys(rest2);
+        } while (rest.length);
+        track = track.map(([d, a, e]) => ` ${new Array(d + 1).join("•")} ${new Array(2 + length - a.length - d).join("-")} ${a} 溃于: ${e.reverse().join(", ")}`)
+        // -->
+        console.error(`加载 ${name} 失败，${ed && ed.length ? `${ed.join(', ')} 等 ${ed.length} 个模块` : "没有其他模块"}受到影响。\r\n${track.join("\r\n")}`);
     };
     loadModule(name, function (error) {
         if (hasOwnProperty.call(modules, name)) {
@@ -841,6 +865,7 @@ var modules = {
     MOVELOCK_DELTA: 3 * renderPixelRatio,
     SAFE_CIRCLE_DEPTH: 300,
     init,
+    efrontPath,
     versionTree,
     responseTree,
     loadingTree,
@@ -885,7 +910,7 @@ var initIfNotDefined = function (defined, path, onload) {
     else hook(--requires_count);
 };
-if(document) loadResponseTreeFromStorage();
+if (document) loadResponseTreeFromStorage();
 initIfNotDefined([].map, "[]map", map => map);
 initIfNotDefined(Promise, "Promise", promise => Promise = promise);
 if (!isProduction) window.modules = modules;

package/coms/basic/submit_.js CHANGED Viewed

@@ -4,6 +4,9 @@ function submit(fields, data) {
     var select = [];
     var checks = [];
     var id = 0;
+    var trimname = function (a) {
+        return a.name.replace(/^请?(输入|选择|填写)/, '')
+    };
     for (var f of fields) {
         var error = valid(f, data);
         if (error === "empty") {
@@ -46,13 +49,13 @@ function submit(fields, data) {
     }
     if (checks.length + select.length + inputs.length) {
         var errors = [];
-        if (inputs.length) errors.push("请输入" + inputs.map(f => f.name).join("、"));
-        if (select.length) errors.push("请选择" + select.map(f => f.name).join("、"));
+        if (inputs.length) errors.push("请输入" + inputs.map(trimname).join("、"));
+        if (select.length) errors.push("请选择" + select.map(trimname).join("、"));
         if (select.id < inputs.id) {
             errors = errors.reverse();
         }
         if (checks.length) {
-            errors.push(checks.map(f => f.name).join("、") + "格式错误");
+            errors.push("您输入的" + checks.map(trimname).join("、") + "有误");
         }
         errors = errors.join("，") + "！";
         throw errors;