efront 3.5.0 → 3.5.4

package/coms/zimoli/colorpad.js

@@ -4,9 +4,7 @@ var xy2c = function (a, x, y) {
     return a * x * (1 - y) + (.5 + x / 2) * y * 255;
 };
 var z2rgb = function (z) {
-    var c = color.rotate(sample, z * (Math.PI + Math.PI));
-    var [r, g, b] = color.parse(c);
-    return color.rgb4s(r, g, b, 1);
+    return color.rgb4h(255, 0, 0, z * 360);
 };
 var z2c = function (z) {
     return color.stringify(z2rgb(z));
@@ -87,7 +85,7 @@ var c2xy = function (c1, c2) {
 var getCanvas = function (e) {
     return e.getElementsByTagName('canvas')[0];
 };
-var sample = "#ff4949";
+var sample = "#ff0000";
 var buildpad = function (pad, c = sample) {
     var canvas = getCanvas(pad);
     canvas.width = 256;

package/coms/zimoli/data.js

@@ -543,7 +543,8 @@ var privates = {
                     ok(e.response || e.responseText);
                 }).error(xhr => {
                     try {
-                        oh(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
+                        oh({ status: xhr.status, error: e })
                     } catch (error) {
                         oh(error);
                     }
@@ -612,8 +613,7 @@ function responseCrash(e, data) {
     } else {
         data.error = e;
     }
-    error_report(data.error_message, 'error');
-
+    error_report(data.error_message, e.status < 500 ? 'warn' : 'error');
 }
 
 var data = {

package/coms/zimoli/drag.js

@@ -46,6 +46,8 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             var [target_left, target_top] = getOffset(target);
             if (abs(target_left - event.screenX - saved_delta.x) < MOVELOCK_DELTA && abs(target_top - event.screenY - saved_delta.y) < MOVELOCK_DELTA) return;
             saved_delta.ing = true;
+            drag.target = target;
+            dispatch("dragstart", target);
             if (isElement(target) && !/absolute|fixed/.test(getComputedStyle(target).position)) {
                 clone = toCloneTarget(target, isMovingSource);
                 appendChild(document.body, clone);
@@ -62,7 +64,6 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
                 clone.style.zIndex = zIndex();
                 extraClones.map(e => e.style.zIndex = clone.style.zIndex);
             }
-            dispatch("dragstart", target);
         }
         drag.target = clone;
         var offsetLeft = saved_delta.x + event.screenX;

package/coms/zimoli/getGenerator.js

@@ -1,7 +1,12 @@
 
 var _slider = createElement(div);
+var empty = function (index, item) {
+    if (!item) return;
+    return document.createElement('empty');
+};
 var getGenerator = function (container) {
     if (!container) return;
+    if (!container.childNodes.length) return container.$generator || empty;
     var template = document.createElement("div");
     var templates = [].concat.apply([], container.childNodes).filter(a => {
         if (a.hasAttribute('insert')) {
@@ -21,7 +26,7 @@ var getGenerator = function (container) {
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
     var scopes = container.$parentScopes.concat(container.$scope);
-    return function (index, com) {
+    return container.$generator = function (index, com) {
         if (!com) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];

package/coms/zimoli/image.less

@@ -16,6 +16,8 @@
         border: none;
         width: 100%;
         cursor: pointer;
+        padding: 0;
+        margin: 0;
 
         >.track {
 

package/coms/zimoli/menu.js

@@ -155,6 +155,7 @@ function main(elem, mode) {
                     active(elem, item, item.value);
                 };
                 if ("$src" in elem) {
+                    getGenerator(elem);
                     care(elem, function (src) {
                         menuList(elem, getTreeFromData(src), emit, direction);
                     });

package/coms/zimoli/on.js

@@ -144,6 +144,22 @@ function checkKeyNeed(eventtypes, e) {
     }
     return true;
 }
+function wrapHandler(h) {
+    if (h instanceof Function) {
+        return function () {
+            var res = h.apply(this, arguments);
+            if (res && isFunction(res.then)) {
+                this.setAttribute('pending', '');
+                var removePending = () => {
+                    this.removeAttribute('pending');
+                };
+                res.then(removePending, removePending);
+            }
+            return res;
+        }
+    }
+    return h;
+}
 if (is_addEventListener_enabled) {
     var on = function (k) {
         var on_event_path = "on" + k;
@@ -151,6 +167,7 @@ if (is_addEventListener_enabled) {
         var eventtypes = parseEventTypes(k);
         k = k.replace(eventtypereg, '');
         function addhandler(element, handler, firstmost) {
+            handler = wrapHandler(handler);
             if (eventtypes.capture) firstmost = true;
             if (k === changes_key) {
                 if (!element.needchanges) element.needchanges = 0;
@@ -190,6 +207,7 @@ if (is_addEventListener_enabled) {
 
         if (handlersMap[on_event_path]) return handlersMap[on_event_path];
         function addhandler(element, handler, firstmost = false) {
+            handler = wrapHandler(handler);
             if (eventtypes.capture) {
                 console.warn("当前运行环境不支持事件capture");
                 firstmost = true;

package/coms/zimoli/render.js

@@ -55,7 +55,7 @@ var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s]|\?\s*\.(?=[^\d])
 var createGetter = function (search, isprop = true) {
     var [withContext, searchContext] = search;
     if (!searchContext) return function () { };
-    var ret = /\;|(\d\.|[^\{\.\+\:\?\-\=\*\/\?\\,~!<>%\^&\}\s])\s*([\r\n\u2028\u2029])\s*(\.\d|[^\.\+\-\=\*\/\?\\,~!<>%\^&\[\}\(\?\:\s])/.test(searchContext) ? "" : "return ";
+    var ret = /\;/.test(searchContext) ? "" : "return ";
     if (/\?\s*\.(?=[^\d])/.test(searchContext)) {
         searchContext = searchContext.replace(variableReg, function (context) {
             var dist;
@@ -384,7 +384,7 @@ var src2 = function (search) {
             temp = "";
         }
         var changes = getChanges(temp, savedValue);
-        if (!changes) return;
+        if (!changes || isEmpty(origin) && isEmpty(this.src)) return;
         savedValue = temp;
         this.src = origin;
         cast(this, origin);
@@ -537,6 +537,7 @@ var emiters = {
             var res = getter.call(this, e);
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
+            return res;
         });
     },
     once(key, search) {
@@ -545,6 +546,7 @@ var emiters = {
             var res = getter.call(this, e);
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
+            return res;
         });
     }
 };

package/coms/zimoli/table.html

@@ -8,7 +8,7 @@
     <tr>
         <td -repeat="f in fields">
             <span -if="f.key" -text="d[f.key]"></span>
-            <a on-click="o.do(d)" -if="f.type==='btn'" -repeat="o in f.options">
+            <a on-click="o.do(d)" -if="f.options" -repeat="o in f.options">
                 <span -text=o.name></span>
             </a>
         </td>

package/coms/zimoli/table.js

@@ -91,6 +91,10 @@ var adaptTarget = function (event) {
             }
             if (target) target = getFirstSingleColCell(this, target.colend);
             if (target) {
+                if (position.right >= getSelection(this).right - 7) {
+                    target = this;
+                    return;
+                }
                 css(this, { 'cursor': 'e-resize' });
                 result = {
                     target,
@@ -142,6 +146,7 @@ function table(elem) {
     var cellMatchManager = function (element) {
         if (!thead) [thead] = table.getElementsByTagName("thead");
         if (table.resizing) return false;
+        if (!getTargetIn(thead, element)) return false;
         if (!tdElementReg.test(element.tagName)) return false;
         var savedRowDeltas = [];
         [].map.call(thead.children, function (tr) {
@@ -164,7 +169,10 @@ function table(elem) {
     })
     autodragchildren(
         table,
-        cellMatchManager,
+        function (a) {
+            console.log('match')
+            return cellMatchManager.apply(this, arguments);
+        },
         function (src, dst, rel, append, parentNode) {
             if (table.src) {
                 var [fields] = table.src;

package/coms/zimoli/table.less

@@ -1,15 +1,17 @@
-&.dragging {
-    box-shadow: 0 0 20px -6px #00000033;
-
+&[dragchildren] {
     >thead,
     >tbody,
     & {
         >tr {
 
             >th,
-            >td {}
+            >td {
+                box-shadow: 1px 0 0 0 #00000033, -1px 0 0 0 #00000033;
+            }
+
         }
     }
+
 }
 
 thead,
@@ -17,10 +19,15 @@ tbody,
 th,
 td,
 tr,
-table {
+table,
+& {
     box-sizing: border-box;
 }
 
+& {
+    outline: 1px solid #0006;
+}
+
 .y-ing {
     &:before {
         content: "";
@@ -78,7 +85,7 @@ table {
             position: relative;
         }
 
-        &:nth-child(even) {
+        &:nth-of-type(even) {
 
             >td,
             >th {
@@ -86,7 +93,7 @@ table {
             }
         }
 
-        &:nth-child(odd) {
+        &:nth-of-type(odd) {
 
             >td,
             >th {
@@ -103,7 +110,8 @@ table {
         }
     }
 }
-.button{
+
+.button {
     margin-right: 10px;
     vertical-align: middle;
     display: inline-block;

package/coms/zimoli/view.less

@@ -22,7 +22,8 @@ body>& {
 
 &>.body,
 >[body] {
-    padding: 6px 0;
+    padding: 6px 20px 6px 6px;
+    margin-right: -20px;
     background: #f2f4f6;
     display: block;
     width: auto;
@@ -109,14 +110,14 @@ body>& {
 }
 
 .button {
-    min-width: 60px;
     vertical-align: middle;
-    margin-right: 10px;
 }
 
 >.foot,
 >[foot] {
     .button {
+        min-width: 60px;
         padding: 0 20px;
+        margin-right: 10px;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.5.0",
+    "version": "3.5.4",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {