efront 4.22.1 → 4.22.2

package/coms/basic/refilm_decode.js

@@ -315,28 +315,36 @@ function parse(piece) {
             holder,
             do: action,
             editable,
+            colon,
             avoid,
             needs, valid, repeat, endwith,
             required, inlist, hidden, readonly,
             delete_onempty, delete_onsubmit,
+            option_to,
+            options_from,
         } = name;
     }
     else if (typeof type === 'string') {
         var test = (reg, a) => {
             if (reg.test(a)) {
-                return true;
+                a = a.replace(reg, '');
+                return [true, a];
             }
+            return [, a];
         };
         var is = function (a) {
-            var reg = /^[\*\+\-\!\-&\?\~]|^\$(?!\d)|[\*\+\-\!\-\$&\?\~]$/;
+            var reg = /^\$(?!\d)|[\*\+\-\!\-\$&\?\~\:;]|^[\*\+\-\!\-&\?\~]$/;
             if (!reg.test(a)) return a;
-            required = test(/^\*|\*$/, a);
-            if (test(/^[\+]|[\+]$/, a)) inlist = true;
-            if (test(/^[\!]|[\!]$/, a)) inlist = false;
-            hidden = test(/^\-|\-$/, a);
-            readonly = test(/^&|\$(?!\d)|[\$&]$/, a);
-            delete_onempty = test(/^\?|\?$/, a);
-            delete_onsubmit = test(/^\~|\~$/, a);
+            [colon, a] = test(/\;$/, a);
+            if (colon) colon = false;
+            else[colon, a] = test(/;$/, a);
+            [required, a] = test(/^\*|\*$/, a);
+            [inlist, a] = test(/^[\+]|[\+]$/, a);
+            [inlist, a] = test(/^[\!]|[\!]$/, a);
+            [hidden, a] = test(/^\-|\-$/, a);
+            [readonly, a] = test(/^&|\$(?!\d)|[\$&]$/, a);
+            [delete_onempty, a] = test(/^\?|\?$/, a);
+            [delete_onsubmit, a] = test(/^\~|\~$/, a);
             return a.replace(reg, '');
         };
         var type1 = is(type);
@@ -456,6 +464,9 @@ function parse(piece) {
     var field = {
         name, type, key, value, comment, options,
         editable,
+        colon,
+        option_to,
+        options_from,
         size, unit, ratio, holder,
         needs, valid, repeat, endwith,
         required, inlist, hidden, readonly,

package/coms/zimoli/field.html

@@ -1,6 +1,6 @@
-<template a-if="!checkNeeds(field.needs,data)"></template>
+<template a-if="!check(data,field.needs)"></template>
 <template v-else-if='field?.name'>
-    <div class="head">
+    <div class="head" nocolon:="field.colon===false">
         <span ng-bind=field.name></span>
         <span class="required" ng-if="field.required">*</span>
     </div>

package/coms/zimoli/field.js

@@ -3,7 +3,7 @@ var reshape = function () {
     var isInlineBlock = body && /^inline/i.test(getComputedStyle(body).display);
     if (head && body) {
         var left = head.offsetWidth + 1;
-        if (isInlineBlock && left < body.offsetWidth >> 2) {
+        if (isInlineBlock && left < (this.break || body.offsetWidth >> 2)) {
             css(head, {
                 marginRight: fromOffset(-left),
                 marginBottom: ''
@@ -28,7 +28,7 @@ var reshape = function () {
     if (!body) body = head;
     if (foot && body) {
         var right = foot.offsetWidth + 1;
-        if (isInlineBlock && right < body.offsetWidth >> 2) {
+        if (isInlineBlock && right < (this.break || body.offsetWidth >> 2)) {
             css(foot, {
                 marginTop: '',
                 marginLeft: fromOffset(-right)
@@ -51,65 +51,70 @@ var reshape = function () {
         }
     }
 };
-
+var checkValue = function () {
+    if (!(this.src instanceof Array)) return;
+    var { field, data } = this.$scope;
+    if (!field || !data) return;
+    var v = data[field.key];
+    if (!this.checked) if (v === this.oldValue || isEmpty(this.oldValue) && isEmpty(v)) return;
+    this.checked = false;
+    this.setAttribute("dirty", '');
+    var scope = this.$scope;
+    var error = valid(field, data);
+    if (error) {
+        this.setAttribute("error", error);
+        switch (error) {
+            case "empty":
+                scope.error = true;
+                break;
+            default:
+                if (isNode(error)) {
+                    scope.error = error;
+                }
+                else {
+                    scope.error = document.createElement('error');
+                    scope.error.innerHTML = error;
+                }
+        }
+    }
+    else {
+        this.removeAttribute('error');
+        scope.error = null;
+    }
+    this.oldValue = data[field.key];
+};
+function ondigest() {
+    checkValue.call(this);
+    reshape.call(this);
+}
+function ondata(p) {
+    var [field, data] = p;
+    this.oldValue = data[field.key];
+    this.setAttribute("field", field.key);
+    this.innerHTML = template;
+    render(this, {
+        model,
+        data,
+        error: null,
+        field,
+        container,
+        check,
+        readonly: !!this.readonly
+    });
+    this.reshape();
+}
 function main(elem) {
     if (!isElement(elem)) elem = document.createElement('field');
     elem.reshape = reshape;
-    resizingList.set(elem, () => elem.reshape());
+    if (elem.break === false) elem.break = Infinity;
+    resizingList.set(elem, reshape);
     elem.setAttribute("field", '');
-    var scope = {};
-    elem.$renders = [function () {
-        if (!(this.src instanceof Array)) return;
-        var [f, data] = this.src;
-        if (!f || !data) return;
-        var v = data[f.key];
-        if (!this.checked) if (v === this.oldValue || isEmpty(this.oldValue) && isEmpty(v)) return;
-        this.checked = false;
-        this.setAttribute("dirty", '');
-        var error = valid(f, data);
-        if (error) {
-            this.setAttribute("error", error);
-            switch (error) {
-                case "empty":
-                    scope.error = true;
-                    break;
-                default:
-                    if (isNode(error)) {
-                        scope.error = error;
-                    }
-                    else {
-                        scope.error = document.createElement('error');
-                        scope.error.innerHTML = error;
-                    }
-            }
-        }
-        else {
-            this.removeAttribute('error');
-            scope.error = null;
-        }
-        this.oldValue = data[f.key];
-    }]
+    elem.$digest = ondigest;
     elem.removeAttribute("tabindex");
 
-    if (!elem.childNodes.length) care(elem, function (p) {
-        var [f, data] = p;
-        elem.innerHTML = field;
-        render(elem, scope = {
-            model,
-            data,
-            error: null,
-            field: f,
-            container,
-            checkNeeds(needs, data) {
-                var res = check(data, needs);
-                return res;
-            },
-            readonly: !!this.readonly
-        });
-        elem.oldValue = data[f.key];
-        elem.setAttribute("field", f.key);
-        elem.reshape();
-    }, false);
+    if (!elem.childNodes.length) {
+        care(elem, ondata, false);
+    }
     else {
         var [head, body, foot] = getTypedChildren(elem, ["head", 'body', 'foot']);
         if (head) addClass(head, "head");

package/coms/zimoli/field.less

@@ -37,6 +37,22 @@ model {
     }
 }
 
+[nocolon] & {
+    >.head {
+        &:after {
+            display: none;
+        }
+    }
+}
+
+[nocolon] &>.head,
+&[nocolon]>.head,
+>.head[nocolon] {
+    &:after {
+        display: none;
+    }
+}
+
 >.body {
     .image {
         margin: 10px 0;
@@ -57,12 +73,14 @@ model {
 }
 
 >.foot {
+    text-align: right;
+    right: 0;
+
     span {
-        vertical-align: middle;
+        vertical-align: top;
     }
 }
 
-
 .input {
     width: 100%;
 }

package/coms/zimoli/grid.js

@@ -547,6 +547,7 @@ var grid_prototype = {
                 current_b = temp_b;
             } else {
                 var _div = point.target;
+                if (!_div && grid.patchCell) _div = point.target = document.createElement('cell');
                 if (_div && _div.parentNode !== grid) appendChild(grid, _div);
                 var current_value;
                 if (current_d === "x") {

package/coms/zimoli/image.html

@@ -1,9 +1,9 @@
-<btn class="plus" ng-if="!hasInstance" ng-click=this.parentNode.choose()>
+<btn class="plus" ng-if="!this.parentNode.hasInstance?" ng-click=this.parentNode.choose()>
     <div class="icon">
         ＋
     </div>
     <div>添加图片</div>
 </btn>
-<btn class="label" ng-if="hasInstance" ng-click=this.parentNode.choose()>
+<btn class="label" ng-if="this.parentNode.hasInstance?" ng-click=this.parentNode.choose()>
     更换图片
 </btn>

package/coms/zimoli/image.js

@@ -1,8 +1,4 @@
 var { URL } = window;
-var defaultScope = {
-    hasInstance: false,
-    btn: button
-};
 function setValue(src) {
     if (this.value === src) return;
     this.value = src;
@@ -37,27 +33,26 @@ var choose = function () {
 
 var build = function () {
     var elem = this;
-    var { $scope = {} } = elem;
     elem.choose = choose;
-    extendIfNeeded($scope, defaultScope);
     elem.setValue = setValue;
     elem.getValue = getValue;
-    render(elem, $scope);
+    render(elem, { btn: button });
 };
 
+var ondata = function (src) {
+    css(this, {
+        backgroundImage: `url('${src}')`
+    });
+    this.hasInstance = !!src;
+}
 function main(elem = div()) {
     var { uploadto } = elem;
+    elem.choose = choose;
     elem.innerHTML = image;
     if (!uploadto) {
         uploadto = elem.getAttribute("uploadto");
     }
-    care(elem, function (src) {
-        css(elem, {
-            backgroundImage: `url('${src}')`
-        });
-        this.hasInstance = this.$scope.hasInstance = !!src;
-        render.refresh();
-    }, false);
+    care(elem, ondata, false);
     build.call(elem);
     return elem;
 }

package/coms/zimoli/menuList.js

@@ -197,7 +197,7 @@ function main() {
                 var target = root.actived.target;
                 if (isObject(menu.value)) delete menu.value.children;
                 var targetmenu = getMenu(target);
-                targetmenu.extends(menu.value);
+                extend(targetmenu.value, menu.value);
                 menu = targetmenu;
             }
             else {
@@ -293,6 +293,7 @@ function main() {
         if (istoolbar) {
             if (item.constructor === Item && item.length && !item.extended) {
                 item.extends(item[0]);
+                item.value = Object.assign({}, item.value);
             }
         }
         return generator(index, item);

package/coms/zimoli/model.js

@@ -236,7 +236,8 @@ var setContent = function (value) {
         appendChild(this, value);
     }
     else if (isHandled(value)) {
-        this.innerHTML = value;
+        if (this.field.type === 'html') this.innerHTML = value;
+        else this.innerText = value;
     }
 };
 var Binder = render.Binder, Model = render.Model;
@@ -279,6 +280,19 @@ function getScopeValue() {
 function setScopeValue(v) {
     this.data[this.field.key] = v;
 }
+var copyOptionData = function () {
+    var { data, field } = this;
+    if (!data || !field) return;
+    var { option_to, options } = field;
+    if (!options) return;
+    var value = data[field.key];
+    var option = isObject(value) ? value : value in options ? options[value] : value;
+    extend(data, seek(option, option_to));
+};
+var getOptionsFrom = function () {
+    var { data, field } = this;
+    return data[field.options_from];
+};
 function setBinder(elem, binder) {
     if (binder === elem.$binder) return;
     removeFromList(elem.$renders, elem.$binder);
@@ -293,7 +307,7 @@ function setBinder(elem, binder) {
         if (isHandled(ipt) && ipt !== elem) {
             if (isNode(ipt)) {
                 var model = new Model(getScopeValue, setScopeValue, ipt);
-                model.hook(elem, ipt);
+                model.hook(elem, elem.field.option_to ? copyOptionData : true);
                 appendChild(elem, ipt);
             }
             else {
@@ -352,6 +366,11 @@ var run = function ({ changes }) {
         var [field_type, field_ref] = field_type.split("?");
         field.ref = field_ref;
     }
+    if (field.options_from) {
+        Object.defineProperty(field, 'options', {
+            get: getOptionsFrom.bind(elem)
+        });
+    }
     var type = elem.getAttribute('type');
     if (type !== field_type) {
         elem.setAttribute("type", field_type);