efront 4.21.3 → 4.22.0

package/coms/compile/scanner2.js

@@ -203,17 +203,62 @@ class Code extends Array {
 
 var avoidMap = null;
 var typeMap = Object.create(null);
-function scan() {
-    var [text, type = "js", lastIndex = 0] = arguments;
-    if (isFinite(type)) lastIndex = +type, type = arguments[2] || type;
-    var program = typeMap[type];
+function scan(text) {
+    var fullpath, type, lastIndex = 0, program;
+    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
+        var a = arguments[cx];
+        switch (typeof a) {
+            case "number":
+                lastIndex = a;
+                break;
+            case "string":
+                if (!fullpath) {
+                    fullpath = a;
+                    break;
+                }
+                else if (!type) {
+                    type = a;
+                    break;
+                }
+            case "object":
+            case "function":
+                type = a;
+                break;
+            default:
+                throw new Error('无效参数: ' + type);
+        }
+    }
+    if (!type) {
+        if (/\.[^\.\/\\]+$/i.test(fullpath)) {
+            type = /[^\.\/\\]+$/.exec(fullpath)[0].toLowerCase();
+        }
+        else {
+            type = fullpath || 'js';
+        }
+    }
     if (!program) switch (type) {
         case "html":
-            program = typeMap[type] = new Html;
+        case "xht":
+        case "htm":
+        case "jsp":
+        case "asp":
+        case "php":
+        case "hta":
+        case "vue":
+            type = 'html';
+            program = typeMap[type];
+            if (!program) program = typeMap[type] = new Html;
             break;
         case "js":
+        case "ts":
+        case "jsx":
+        case "tsx":
+        case "mjs":
+        case "cjs":
         case "javascript":
-            program = typeMap[type] = new Javascript;
+            type = "js";
+            program = typeMap[type];
+            if (!program) program = typeMap[type] = new Javascript;
             break;
         default:
             if (type instanceof Function) {
@@ -223,12 +268,13 @@ function scan() {
                 program = type;
             }
             else {
-                console.log(i18n`类型不支持`, type)
+                throw new Error(i18n`类型不支持: ${console.format(`<red2>${type}</red2>`)}`);
             }
             break;
     }
     program.Code = Code;
     program.lastIndex = lastIndex;
+    program.mindpath = fullpath;
     var res = program.exec(text);
     res.autospace = !program.keepspace;
     Object.defineProperty(res, "program", { value: program, enumerable: false })

package/coms/compile/translate.js

@@ -100,7 +100,7 @@ function translate([imap, supports], code) {
         return 0;
     });
     var getm = function (tt, nodup, warn) {
-        var mq = /^(\s*)([\s\S]*?)(\s*)$/.exec(tt);
+        var mq = /^(\s*)([\s\S]*?)([\:\：]?\s*)$/.exec(tt);
         var mq = [mq[1] || '', mq[2], mq[3] || ''];
         var tt = mq[1];
         var wrap = m => {

package/coms/compile/unstruct.js

@@ -134,13 +134,13 @@ var _withget = function (text) {
     if (index < 0) index = text.length;
     var name = text.slice(0, index);
     var prop = text.slice(index);
-    return rescan`${patchMark + "wget"}(${`"${name}"`},[${_evals()}],${name})${prop}`;
+    return rescan.keep`${patchMark + "wget"}(${`"${name}"`},[${_evals()}],${name})${prop}`;
 };
 var _withset = function (text, tmpname, valname) {
     var index = text.indexOf(".");
     if (index < 0) index = text.length;
     var name = text.slice(0, index);
-    return rescan`if(${tmpname}=${patchMark + "with"}(${`"${name}"`},[${_evals()}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
+    return rescan.keep`if(${tmpname}=${patchMark + "with"}(${`"${name}"`},[${_evals()}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
 };
 var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
@@ -324,7 +324,7 @@ var _while = function (body, cx, unblock, result) {
     o = o.next;
     while (cx < body.length && body[cx] !== o) cx++;
     var i = result.length;
-    var b = rescan`if (${getCondition(o, unblock, true)}) return []`;
+    var b = rescan.keep`if (${getCondition(o, unblock, true)}) return []`;
     var be = b[b.length - 1];
     pushstep(result, b);
     var i2 = result.length - 1;
@@ -351,7 +351,7 @@ var pushstep = function (result, step) {
     }
     else if (q.await_) {
         if (!step.awaited) {
-            step.unshift(...rescan`${q.name}=${ret_};`), relink(step);
+            step.unshift(...rescan.keep`${q.name}=${ret_};`), relink(step);
             step.awaited = true;
         }
         result.push(step);
@@ -435,7 +435,7 @@ var _do = function (body, cx, unblock, result) {
     o = o.next.next;
 
     if (label.continue) ifpatch(result), label.contat = result.length;
-    var b = rescan`if (${getCondition(o, unblock)}) return [${i - result.length}, 0]`;
+    var b = rescan.keep`if (${getCondition(o, unblock)}) return [${i - result.length}, 0]`;
     pushstep(result, b);
     b[b.length - 1][0].text = String(i - result.length + 1);
     while (cx < body.length && body[cx] !== o) cx++;
@@ -464,7 +464,7 @@ var _return = function (r) {
         x = stepReturn(name, 2);
     }
     else if (e === THROW) {
-        x = rescan`throw ${name}`;
+        x = rescan.keep`throw ${name}`;
     }
     else if (e === YIELD) {
         x = stepReturn(name, 3);
@@ -781,7 +781,7 @@ var ternary = function (body, getname, ret) {
                 }
                 pushstep(d, stepReturn(1, 0, d));
                 pushstep(c, stepReturn(d.length + 1, 0, c));
-                pushstep(explist, rescan`if (${getCondition(b, function (b) {
+                pushstep(explist, rescan.keep`if (${getCondition(b, function (b) {
                     b = ternary(b, getnextname, true);
                     for (var b of b) pushstep(explist, b);
                     return b;
@@ -1323,10 +1323,10 @@ function toqueue(body, getname, ret = false, result = []) {
                 var n = getCondition(o, unblock, !isbr);
                 o = o.next;
                 if (isbr) {
-                    var c = rescan`if (${n})`;
+                    var c = rescan.keep`if (${n})`;
                 }
                 else {
-                    var c = rescan`if (${n}) return [0, 0]`;
+                    var c = rescan.keep`if (${n}) return [0, 0]`;
                 }
                 var ce = c[3];
                 pushstep(result, c);

package/coms/crypt/encode62.js

@@ -28,6 +28,16 @@ Object.assign(encode62, {
     src,
     map,
     time_delta: parseInt("zzzzz", 36),
+    pack: 'efront-encode62s',
+    packdecode(string) {
+        return this.timedecode(string, this.pack);
+    },
+    packencode(string) {
+        return this.timeencode(string, this.pack);
+    },
+    packupdate(string) {
+        return this.timeupdate(string, this.pack);
+    },
     safeencode(string, sign, offset) {
         string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
         return this.encode62(string, sign, offset);
@@ -36,23 +46,43 @@ Object.assign(encode62, {
         string = this.decode62(string, sign, offset).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
         return decodeURIComponent(string);
     },
-    timedecode(string) {
+    timedecode(string, pack) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        return this.safedecode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = string.slice(0, string.length - time_delta.toString(36).length);
+        if (pack) {
+            string = this.decode62(string, time_stamp.toString(36) + pack);
+            var sign = string.slice(string.length - 7, string.length);
+            sign = parseInt(sign, 36);
+            sign -= 0x600000000 + (time_stamp & 0xffffffff);
+            string = string.slice(0, string.length - 7);
+            string = decode62S(string);
+            if (crc.string(time_stamp.toString(36) + pack + string) !== sign) throw new Error('数据校验不通过！');
+            return string;
+        }
+        return this.safedecode(string, time_stamp.toString(36));
     },
-    timeencode(string) {
+    timeencode(string, pack) {
         var { time_delta } = this;
         var time_free = time_delta / 6 | 0;
         var time_stamp = +new Date() - time_free;
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
-        return this.safeencode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
+        if (pack) {
+            var sign = crc.string(time_stamp.toString(36) + pack + string);
+            sign += 0x600000000 + (time_stamp & 0xffffffff);
+            string = encode62S(string) + sign.toString(36);
+            string = this.encode62(string, time_stamp.toString(36) + pack);
+        }
+        else {
+            string = this.safeencode(string, time_stamp.toString(36));
+        }
+        return string + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
-    timeupdate(string) {
+    timeupdate(string, pack) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
@@ -60,7 +90,7 @@ Object.assign(encode62, {
         if (time_stamp + (time_delta >> 1) > +new Date()) {
             return string;
         } else {
-            return this.timeencode(this.timedecode(string));
+            return this.timeencode(this.timedecode(string, pack), pack);
         }
     },
     encode62(data, sign, offset = 0) {

package/coms/crypt/encode62_test.js

@@ -1,51 +1,11 @@
 "use strict";
 // 中文编码 utf-8
-describe("encode62_test", function () {
-    var encode62, a, b, c, d;
-    var expect = require("chai").expect;
-    var timeencoded;
-    before(function () {
-        encode62 = require("./encode62");
-    });
-    it("encode62", function () {
-        console.log(encode62("你好啊"));
-    });
-    it("encode62.timeencode", function () {
-        console.log(timeencoded = encode62.timeencode("xiao"));
-    });
-    it("encode62.timedecode", function () {
-        console.log(encode62.timedecode(timeencoded));
-    });
-    it("encode62.encode", function () {
-        console.log(timeencoded = encode62.encode("adfasd", 'abcd'));
-    });
-    it("encode62.decode", function () {
-        console.log(encode62.decode(timeencoded, 'abcd').toString());
-    });
-    it("geta", function () {
-        a = encode62.geta("efront");
-    });
-    it("genb", function () {
-        b = encode62.genb();
-    });
-    it("ab2c", function () {
-        c = encode62.ab2c(a, b);
-    });
-    it("ba2d", function () {
-        // 注意，参数顺序已变更
-        d = encode62.ba2d(b, a);
-    });
-    it("ca2b", function () {
-        expect(encode62.ca2b(c, a)).to.be.eq(b);
-    });
-    it("cb2a", function () {
-        expect(encode62.cb2a(c, b)).to.be.eq(a);
-    });
-    it("da2b", function () {
-        expect(encode62.da2b(d, a)).to.be.eq(b);
-    });
-    it("db2a", function () {
-        expect(encode62.db2a(d, b)).to.be.eq(a);
-    })
+var test = function (string) {
+    var packed = encode62.packencode(string);
+    var unpacked = encode62.packdecode(packed);
+    assert(string, unpacked);
+}
 
-});
+test('adsfa');
+test('a');
+test('');

package/coms/explorer/main.less

@@ -59,11 +59,7 @@ fileitem {
         outline: 1.2px solid #28c;
     }
 
-    &:active {
-        color: #28c;
-        outline: 2px solid;
-    }
-
+    
     &.focused {
         background: #28c2;
         outline: 1.2px solid #28c;

package/coms/frame/chat.js

@@ -136,7 +136,7 @@ function chat(title = '会话窗口') {
                     break;
             }
             return false;
-        }).map(m => JSAM.parse(encode62.timedecode(m))).filter(m => {
+        }).map(m => JSAM.parse(encode62.packdecode(m))).filter(m => {
             if (m.type === 'accept') {
                 page.$scope.pushFile(m.content);
                 return false;
@@ -266,7 +266,7 @@ function chat(title = '会话窗口') {
             if (this.user && this.user.id !== this.localid && type !== "accept") {
                 addToMsgList(this.msglist, [msg]);
             }
-            data = encode62.timeencode(data);
+            data = encode62.packencode(data);
             cast(page, "send", data);
             this.body.lastElementChild.focus();
             this.text = '';

package/coms/frame/left.html

@@ -1,13 +1,14 @@
-<header ng-if="!user.isLogin" class="navbar-header">
+<header head ng-if="!user.isLogin" class="navbar-header">
     <!-- <avatar></avatar> -->
     <a @click="popup('#/user/login')" class="dashboard_text">请登录</a>
 </header>
-<header -else class="navbar-header">
+<header head -else class="navbar-header">
     <span class="dashboard_text" @click="go('/user/profile')">
         <avatar ng-src="user.avatar" size=30></avatar>
         <span ng-bind="user.name"></span>
         <span ng-bind="user.roles"></span>
     </span>
 </header>
-<ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(menu)">
-</ylist>
+<ylist body mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(menu)">
+</ylist>
+<footer foot></footer>

package/coms/frame/left.js

@@ -17,5 +17,6 @@ function main() {
     on('append')(page, function () {
         frame$route.open();
     });
+    view(page)
     return page;
 }

package/coms/frame/left.less

@@ -1,16 +1,18 @@
 & {
-    padding: 50px 0 0 0;
+    padding: 0 0 0 0;
     position: relative;
 }
 
 .navbar-header {
+    &:before{
+        display: none;
+    }
     min-height: 50px;
     padding: 10px 15px 10px 25px;
     font-size: 25px;
     line-height: 25px;
     text-transform: uppercase;
     color: #b8c7ce;
-    margin-top: -50px;
     display: block;
 }
 
@@ -32,7 +34,7 @@ ylist {
     box-shadow: none;
 }
 
-.label {
+>.header .label {
     border-radius: 4px;
     height: 18px;
     line-height: 18px;

package/coms/frame/payment.js

@@ -22,7 +22,7 @@ function main(paytypes, price, subject = '网站扫码支付') {
             if (!pay) return 'about:blank';
             var url = pay.url;
             if (isFunction(url)) url = url.call(pay, this.finalpay, subject);
-            else if (url) url += encode62.timeencode(this.finalpay + "," + subject);
+            else if (url) url += encode62.packencode(this.finalpay + "," + subject);
             return url;
         },
         get finalpay() {
@@ -50,7 +50,7 @@ function main(paytypes, price, subject = '网站扫码支付') {
     var query = lazy(async function () {
         if (!tradeid || queryres) return;
         if (isFunction(queryurl)) var res = await queryurl(tradeid);
-        else if (isString(queryurl)) var res = await cross('get', queryurl + encode62.timeencode(tradeid)), res = JSAM.parse(res.response || res.responseText);
+        else if (isString(queryurl)) var res = await cross('get', queryurl + encode62.packencode(tradeid)), res = JSAM.parse(res.response || res.responseText);
         if (queryres) return;
         if (res) queryres = res, cast(page, 'payment', res._id);
     }, -200);

package/coms/pivot/acme2.js

@@ -253,12 +253,15 @@ var acme2 = new class {
         var termsOfService = data?.meta?.termsOfService;
         return termsOfService;
     }
-    async newAccount(params) {
+    getAccount(params) {
+        return this.newAccount(params, true);
+    }
+    async newAccount(params, onlyReturnExisting) {
         var account = await request("new-account", {
             "contact": [
                 "mailto:" + params.email
             ],
-            // onlyReturnExisting: false,// 可选
+            onlyReturnExisting: onlyReturnExisting,// 可选
             // externalAccountBinding: {},// 可选
             "termsOfServiceAgreed": params.termsOfServiceAgreed
         });
@@ -267,7 +270,7 @@ var acme2 = new class {
         this.kid = account;
         var a = data.getUrlParamsForApi(accountApi, account);
         this.aid = a.aid;
-        alert('创建成功！', 'success');
+        alert(onlyReturnExisting ? "账号存在" : '创建成功！', 'success');
         return account;
     }
     async newOrder(params) {
@@ -366,7 +369,7 @@ var acme2 = new class {
             o = await acme2.auditOrder(o, setauth);
         }
         if (o.status === 'ready') {
-            await this.finalizeOrder(o, upload);
+            o = await this.finalizeOrder(o, upload);
             o = await this.waitStatus(o);
         }
         if (o.status === 'valid') {

package/coms/pivot/left-footer.xht

@@ -0,0 +1,25 @@
+<style>
+    & {
+        position: absolute;
+        width: 100%;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 1;
+        display: block;
+        text-align: center;
+    }
+</style>
+<div>
+    <a @click="logout">${i18n`退出登录`}</a>
+</div>
+
+<script>
+    var a = button;
+    async function logout() {
+        data.setSource({});
+        await user.Logout();
+        zimoli.switch();
+        zimoli();
+    }
+</script>

package/coms/pivot/pedit.js

@@ -1,9 +1,9 @@
 function send(type, key, value, origin) {
     return data.from(origin, {
         type,
-        key: encode62.timeencode(key),
-        value: isHandled(value) ? encode62.timeencode(JSON.stringify(value)) : '',
-    }, e => e ? JSAM.parse(encode62.timedecode(e)) : '').loading_promise;
+        key: encode62.packencode(key),
+        value: isHandled(value) ? encode62.packencode(JSON.stringify(value)) : '',
+    }, e => e ? JSAM.parse(encode62.packdecode(e)) : '').loading_promise;
 }
 function pedit(title, type, params, idkey = params.fields[0].key) {
     var pdata = params.data;

package/coms/pivot/plist.js

@@ -1,8 +1,8 @@
 function load(type, idkey) {
-    return data.from("list", { type, idkey: encode62.timeencode(idkey) }, a => JSAM.parse(encode62.timedecode(a || '')));
+    return data.from("list", { type, idkey: encode62.packencode(idkey) }, a => JSAM.parse(encode62.packdecode(a || '')));
 }
 function remove(type, key) {
-    return data.from("edit", { type, key: encode62.timeencode(key), value: encode62.timeencode("") }).loading_promise;
+    return data.from("edit", { type, key: encode62.packencode(key), value: encode62.packencode("") }).loading_promise;
 }
 function plist() {
     var title, type, fields, edit_ref, options, idkey, buttons;

package/coms/pivot/qrcode.xht

@@ -2,6 +2,9 @@
     &[empty] {
         opacity: .3;
     }
+    &{
+        cursor: pointer;
+    }
 </style>
 <canvas width="240" height="240" style="width:240px;height:240px;image-rendering: pixelated;" />
 <script>

package/coms/zimoli/XMLHttpRequest.js

@@ -1,4 +1,4 @@
-if (this.XMLHttpRequest) return this.XMLHttpRequest;
+if (this.XMLHttpRequest && this.XMLHttpRequest.prototype && "onreadystatechange" in this.XMLHttpRequest.prototype) return this.XMLHttpRequest;
 if (this.ActiveXObject) return this.ActiveXObject.bind(null, 'Microsoft.XMLHTTP');
 if (!this.fetch) return;
 var window = this;
@@ -17,18 +17,21 @@ XMLHttpRequest.prototype.open = function (method, url) {
 XMLHttpRequest.prototype.send = function (data) {
     var params = { method: this.method, headers: { referer: document.location.href.replace(/^#[\s\S]*$/g, '') } };
     if (data != null) params.body = data;
-    this.fetch(this.url, params).then(function (d) {
-        this.fetched = d;
-        this.readyState = 4;
-        this.status = d.status;
+    var fetched = this.fetch(this.url, params);
+    var xhr = this;
+    fetched.then(function (d) {
+        xhr.fetched = d;
+        xhr.readyState = 4;
+        xhr.status = d.status;
         return d.text();
     }).then(function (d) {
-        this.responseText = d;
-        if (this.onreadystatechange) this.onreadystatechange({ target: this });
-        if (this.onload) this.onload({ target: this });
-    }, function (e) {
-        this.readyState = 4;
-        if (this.onreadystatechange) this.onreadystatechange({ target: this });
-        if (this.onerror) this.onerror({ target: this });
+        xhr.responseText = d;
+        if (xhr.onreadystatechange) xhr.onreadystatechange({ target: xhr });
+        if (xhr.onload) xhr.onload({ target: xhr });
+    })["catch"](function (e) {
+        xhr.readyState = 4;
+        if (xhr.onreadystatechange) xhr.onreadystatechange({ target: xhr });
+        if (xhr.onerror) xhr.onerror({ target: xhr });
     });
-}
+}
+return XMLHttpRequest;

package/coms/zimoli/container.js

@@ -1,45 +1,45 @@
-function container(element) {
-    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(src, c.value);
-                    }
-                    else if (c.name === 'style') {
-                        css(src, c.value);
-                    }
-                    else src.setAttribute(c.name, c.value);
+var change = 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(src, c.value);
+                }
+                else if (c.name === 'style') {
+                    css(src, c.value);
                 }
+                else src.setAttribute(c.name, c.value);
             }
-            zimoli.global(src, this);
-        }
-        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) {
-            this.$src = src;
-            change.call(this, src);
         }
-    };
-    var onparams = lazy(function (params) {
-        zimoli.go(this.$src, params, this);
-    });
+        zimoli.global(src, this);
+    }
+    else if (isString(src) || +src < 0) {
+        onparams.call(this, this.params);
+    }
+};
+var gosrc = function (src) {
+    if (!isHandled(this.$src) && !isHandled(src)) return;
+    if (src !== this.$src) {
+        this.$src = src;
+        change.call(this, src);
+    }
+};
+var goone = function (src) {
+    if ("$src" in this) return;
+    gosrc.call(this, src);
+};
+var onparams = 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);
-        });
+        if (src) oncemount(comment, goone);
     }
     return comment;
 }

package/coms/zimoli/design.html

@@ -1,19 +1,12 @@
 <div class="options">
-    <btn class="add" ng-click=add()><i>+</i>添加</btn>
+    <btn ng-click=add()><i>+</i><SPAN>添加字段</SPAN></btn>
 </div>
-<list ng-src='(field,cx) in fields' class="fields">
+<dlist ng-src='(f,cx) in fields' class="fields">
     <padding>
         <div class="field-item">
-            <span class="index" ng-bind='field.id'></span>
-            <input @focus="focus(this.parentNode)" @blur="blur(this.parentNode)" placeholder="显示名称"
-                ng-model=field.name />
-            <input @focus="focus(this.parentNode)" @blur="blur(this.parentNode)" placeholder="键名" ng-model=field.key />
-            <select @focus="focus(this.parentNode)" -model="field.type" @blur="blur(this.parentNode)"
-                ng-model=field.type >
-                <option value="">请选择字段类型</option>
-                <option _value="type.key" ng-repeat="type in types" -text="type.name"></option>
-            </select>
-            <btn ng-click=remove(field)>移除</btn>
+            <i .index -bind="cx+1"></i>
+            <field -src="[d,f]" -repeat="d in defines"></field>
+            <drop ng-click="remove(f)"></drop>
         </div>
     </padding>
-</list>
+</dlist>