efront 4.5.0 → 4.5.3

package/coms/zimoli/model.js

@@ -104,6 +104,15 @@ var constructors = {
         input(ipt);
         return ipt;
     },
+    generator(elem) {
+        var { data, field } = elem;
+        elem.innerHTML = `<a @click="gen()" -if="!data[field.key]">${field.holder || '单击生成'}</a><span -else -bind="data[field.key]"></span>`;
+        render(elem, {
+            data, field, a: button, async gen() {
+                await field.options(data);
+            }
+        });
+    },
     date() {
         var elem = document.createElement("input");
         elem.type = "date";
@@ -192,6 +201,7 @@ var constructors = {
     }
 };
 constructors.price = constructors.money = constructors.number;
+constructors.gen = constructors.generator;
 var readonly_types = {
     "date"({ field }, data) {
         var string = data[field.key];
@@ -199,9 +209,11 @@ var readonly_types = {
     },
     "url"({ field }, data) {
         var href = data[field.key];
-        var e = anchor2(href, href);
-        e.target = "_blank";
-        return e;
+        if (href) {
+            var e = anchor2(field.holder || href, href);
+            e.target = "_blank";
+            return e;
+        }
     },
     "size"({ field }, data) {
         var f = data[field.key];
@@ -212,6 +224,10 @@ var readonly_types = {
         t.innerHTML = seek(data, a.field.key);
         return t;
     },
+    text(e) {
+        var { data, field } = e;
+        e.innerHTML = data[field.key] ?? '';
+    },
     swap(e, data) {
         var { field } = e;
         var v = data[field.key];
@@ -227,6 +243,7 @@ var readonly_types = {
     },
 };
 readonly_types.anchor = readonly_types.url;
+readonly_types.gen = readonly_types.generator = readonly_types.text;
 var createOptionsMap = function (options) {
     if (!isObject(options[0])) return options;
     var map = Object.create(null);

package/coms/zimoli/scrollbar.js

@@ -233,8 +233,10 @@ function main(elem) {
     }
     if (/^[xh]/i.test(direction)) {
         bar = scrollbar_x(elem);
+        bar.setAttribute('x', '');
     } else {
         bar = scrollbar_y(elem);
+        bar.setAttribute('y', '');
     }
     if (target) bar.bindTarget(target);
     return bar;

package/coms/zimoli/view.js

@@ -103,12 +103,12 @@ var resize2 = function () {
         else if (isType(c, "foot")) foot = c;
     }
     if (head && body) {
-        var height = head.offsetHeight;
+        var height = head.offsetHeight + head.offsetTop;
         css(head, {
             marginBottom: fromOffset(-height),
         })
         css(body, {
-            paddingTop: fromOffset(height)
+            paddingTop: fromOffset(height - body.clientTop)
         });
     }
     if (foot && body) {
@@ -120,11 +120,13 @@ var resize2 = function () {
             marginTop: fromOffset(-height)
         })
     }
-    if (body.scrollHeight + body.offsetTop > this.clientHeight) {
-        css(body, { height: fromOffset(this.clientHeight) });
-    }
-    else {
-        css(body, { height: '' });
+    if (body) {
+        if (body.scrollHeight + body.offsetTop > this.clientHeight) {
+            css(body, { height: fromOffset(this.clientHeight) });
+        }
+        else {
+            css(body, { height: '' });
+        }
     }
 };
 function view(element) {
@@ -142,6 +144,7 @@ function view(element) {
         if (w.resizable) resize.on(w);
     }
     resizingList.set(w, resize2);
+    w.renders = [resize2];
     w.reshape = lazy(resize2);
     onmounted(w, w.reshape);
     return w;

package/coms/zimoli/view.less

@@ -124,7 +124,6 @@ body>& {
 >.foot,
 >[foot] {
     .button {
-        min-width: 60px;
         padding: 0 20px;
         margin-left: 10px;
         vertical-align: top;
@@ -132,6 +131,7 @@ body>& {
     }
 
     a.button {
+        display: inline-block;
         padding: 0;
     }
 }

package/coms/zimoli/watch.js

@@ -3,7 +3,7 @@ function watcher({ changes }) {
     for (var k in changes) {
         if (k in watches) {
             var { current, previous } = changes[k];
-            watches[k](current, previous);
+            watches[k].call(this, current, previous);
         }
     }
 }

package/docs//347/273/204/344/273/266.xht

@@ -12,7 +12,6 @@
 
     [body] {
         border-top: 42px solid transparent;
-        margin-top: -82px;
         padding-top: 40px;
         padding-bottom: 0 !important;
         border-bottom: 46px solid transparent;

package/package.json

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