efront 2.44.8 → 2.46.0

package/coms/zimoli/submit.js

@@ -0,0 +1,41 @@
+function submit(fields, data) {
+    var params = {};
+    var inputs = [];
+    var select = [];
+    var checks = [];
+    var id = 0;
+    for (var f of fields) {
+        var error = valid(f, data);
+        if (error === "empty") {
+            if (f.options || /date|time|range|switch|swap|radio/i.test(f.type)) {
+                if (!select.id) select.id = ++id;
+                select.push(f);
+            }
+            else {
+                if (!inputs.id) inputs.id = ++id;
+                inputs.push(f);
+            }
+        }
+        else if (error) {
+            checks.push(f);
+        }
+        else {
+            params[f.key] = data[f.key];
+        }
+    }
+    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 (select.id < inputs.id) {
+            errors = errors.reverse();
+        }
+        if (checks.length) {
+            errors.push(checks.map(f => f.name).join("、") + "格式错误");
+        }
+        errors = errors.join("，") + "！";
+        alert(errors, 'error');
+        throw new Error(errors);
+    }
+    return params;
+}

package/coms/zimoli/table.html

@@ -0,0 +1,16 @@
+<thead>
+    <tr>
+        <td -repeat="f in fields"><i -if="f.icon" -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
+        </td>
+    </tr>
+</thead>
+<tbody -src="d in data">
+    <tr>
+        <td -repeat="f in fields">
+            <span -if="f.key" -text="d[f.key]"></span>
+            <a on-click="o.do(d)" -if="f.options" -repeat="o in f.options">
+                <span -text=o.name></span>
+            </a>
+        </td>
+    </tr>
+</tbody>

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) {
@@ -153,10 +158,27 @@ function table(elem) {
     table.dragbox = function () {
         return thead;
     };
+    care(table, function ([fields, data]) {
+        this.innerHTML = template;
+        render(this, {
+            fields,
+            tbody: list,
+            data,
+            a: button,
+        }, this.$parentScopes.concat(this.$scope));
+    })
     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;
+                var [f] = fields.splice(src, 1);
+                fields.splice(dst, 0, f);
+            }
             var children = parentNode.children;
             var srcElement = children[src];
             var dstElement = children[rel];

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: "";
@@ -45,56 +52,67 @@ table {
     table-layout: fixed;
     white-space: nowrap;
 
-    >thead {
-        user-select: none;
-        line-height: 36px;
+}
 
-        >tr {
+>thead {
+    user-select: none;
+    line-height: 36px;
 
-            >td,
-            >th {
-                padding: @cell-padding;
-                position: relative;
-                color: #fff;
-                background-color: #999;
-            }
+    >tr {
+
+        >td,
+        >th {
+            padding: @cell-padding;
+            position: relative;
+            color: #fff;
+            background-color: #999;
         }
     }
+}
 
-    >tbody {
-        line-height: 32px;
+>tbody {
+    line-height: 32px;
+    height: 100%;
+    min-height: 30px;
 
-        >tr {
+    display: table-row-group;
 
-            >td,
-            >th {
-                padding: @cell-padding;
-                position: relative;
-            }
+    >tr {
+
+        >td,
+        >th {
+            padding: @cell-padding;
+            position: relative;
+        }
 
-            &:nth-child(even) {
+        &:nth-of-type(even) {
 
-                >td,
-                >th {
-                    background-color: #eee;
-                }
+            >td,
+            >th {
+                background-color: #eee;
             }
+        }
 
-            &:nth-child(odd) {
+        &:nth-of-type(odd) {
 
-                >td,
-                >th {
-                    background-color: #fff;
-                }
+            >td,
+            >th {
+                background-color: #fff;
             }
+        }
 
-            &:hover {
+        &:hover {
 
-                >td,
-                >th {
-                    background: #dddddd;
-                }
+            >td,
+            >th {
+                background: #dddddd;
             }
         }
     }
+}
+
+.button {
+    margin-right: 10px;
+    vertical-align: middle;
+    display: inline-block;
 }

package/coms/zimoli/tree.js

@@ -251,7 +251,7 @@ function tree() {
                 com.forEach(z);
                 setState();
             };
-
+            var time = size => (Math.log(-size / 30 + 2) * 100 | 0) / 1000;
             if (com.isClosed() && com.length) {
                 z0();
                 setState(true);
@@ -265,7 +265,7 @@ function tree() {
                     marginTop = top.offsetTop - bottom.offsetTop - bottom.offsetHeight;
                 }
                 var res = transition(top, {
-                    transition: 'margin-top .2s ease-out',
+                    transition: `margin-top ${time(marginTop)}s ease-out`,
                     marginTop: fromOffset(marginTop)
                 }, true);
                 if (res) timeout(refresh, res);
@@ -282,7 +282,7 @@ function tree() {
                 }
                 setState(false);
                 z0();
-                var res = transition(change_elem, { transition: "margin-top .2s ease-out", marginTop: fromOffset(margin_top) }, false);
+                var res = transition(change_elem, { transition: `margin-top ${time(margin_top)}s ease-out`, marginTop: fromOffset(margin_top) }, false);
                 timeout(z1, res);
             }
         });
@@ -307,7 +307,7 @@ function tree() {
     };
     var refresh = function () {
         var index = banner.index();
-        var needremoves = dom.map(d => d.target).filter(d=>!!d);
+        var needremoves = dom.map(d => d.target).filter(d => !!d);
         dom = getArrayFromTree(root, true);
         needremoves.forEach(_div => {
             delete _div.initialStyle;

package/coms/zimoli/view.js

@@ -94,11 +94,6 @@ var init = function () {
 function view(element) {
     var window = isNode(element) ? element : document.createElement("form");
     init();
-    if (/form/i.test(window.tagName)) {
-        on("submit")(window, function (event) {
-            event.preventDefault();
-        });
-    }
     extend(window, prototype);
     if (window !== element) {
         extend(window, element);

package/coms/zimoli/view.less

@@ -13,14 +13,17 @@ body>& {
     -ms-user-select: none;
     -moz-user-select: none;
     -webkit-user-select: none;
+    border: 1px solid #0006;
 }
 
 &[dragable] {
     position: absolute;
 }
 
-&>.body {
-    padding: 6px 0;
+&>.body,
+>[body] {
+    padding: 6px 20px 6px 6px;
+    margin-right: -20px;
     background: #f2f4f6;
     display: block;
     width: auto;
@@ -42,7 +45,8 @@ body>& {
 }
 
 
-&>.head {
+&>.head,
+>[head] {
     z-index: 2;
     background: #fffc;
     position: relative;
@@ -83,12 +87,14 @@ body>& {
     }
 }
 
-&>.foot {
+&>.foot,
+>[foot] {
     white-space: nowrap;
     overflow: auto;
 }
 
-&>.foot {
+&>.foot,
+>[foot] {
     z-index: 1;
     text-align: right;
     line-height: 1;
@@ -101,13 +107,17 @@ body>& {
     bottom: 0;
     margin-top: -42px;
 
+}
+
+.button {
+    vertical-align: middle;
+}
+
+>.foot,
+>[foot] {
     .button {
-        padding: 0 20px;
         min-width: 60px;
-        vertical-align: middle;
-
-        &+.button {
-            margin-left: 10px;
-        }
+        padding: 0 20px;
+        margin-right: 10px;
     }
 }

package/coms/zimoli/zimoli.js

@@ -58,7 +58,7 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.length);
             go(targetpath);
             return;
         }
@@ -110,7 +110,7 @@ var setZimoliParams = function (pagepath, args) {
 };
 var fullfill_is_dispatched = 0;
 function go(pagepath, args, history_name, oldpagepath) {
-    if (!history_name)
+    if (history_name === undefined)
         history_name = current_history;
     if (isNumber(pagepath)) {
         if (isString(history_name)) {
@@ -297,7 +297,7 @@ function prepare(pgpath, ok) {
         // rolesA中的role1,role2,...等所有身份都必须具备才可以确定一种访问权限
         // 符合rolesA,rolesB,rolesC任意一种权限都可以访问
         if (!roles) roles = [];
-        for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
+        if (arguments.length) for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
             roles.push(arguments[cx]);
         }
     };
@@ -408,6 +408,7 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
         args = data;
         oldpagepath = from;
     }
+
     if (page_generators[pagepath]) return go(pagepath, args, history_name, oldpagepath);
     return prepare(pagepath, function () {
         if (isNode(history_name)) {
@@ -418,7 +419,7 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
 }
 var global = {};
 var history = {};
-var current_history, default_history = current_history = "zimoli";
+var current_history, default_history = current_history = "";
 history[current_history] = [];
 var history_session_object_key = `_zimoli_history_key:${location_pathname}`;
 try {
@@ -428,7 +429,7 @@ try {
 var root_path;
 var pushstate = function (path_name, history_name, oldpagepath) {
     var isDestroy = false;
-    if (!history_name) {
+    if (history_name === undefined) {
         history_name = current_history;
     }
     if (!isString(history_name)) return;
@@ -454,7 +455,7 @@ var pushstate = function (path_name, history_name, oldpagepath) {
     return isDestroy;
 };
 var popstate = function (path_name, history_name) {
-    if (!history_name) history_name = current_history;
+    if (history_name === undefined) history_name = current_history;
     if (!isString(history_name)) return;
     if (!history[history_name]) return;
     var _history = history[history_name];
@@ -467,11 +468,12 @@ var popstate = function (path_name, history_name) {
 };
 var getCurrentHash = function () {
     var _historylist = history[current_history];
+    var history_name = current_history.replace(/\/$/, '');
     if (rootElements.length) {
-        return `#${current_history}/`;
+        return `#${history_name}/`;
     }
     if (_historylist.length < 2) return "";
-    var targeturl = `#${current_history}${_historylist.length ? _historylist[_historylist.length - 1] : ""}`;
+    var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.length - 1] : ""}`;
     return targeturl;
 };
 
@@ -574,11 +576,17 @@ function addGlobal(element, name = null, isDestroy) {
     }
 }
 var _switch = zimoli.switch = function (history_name = default_history, target_body = document.body, emptyState) {
-    if (isString(history_name))
-        current_history = history_name;
-    if (target_body)
-        body = target_body;
-    if (emptyState !== false && !history[history_name]) root_path = (history[history_name] = [].concat(emptyState || ":empty"))[0];
+    if (!arguments.length) {
+        current_history = default_history;
+        body = document.body;
+    }
+    else {
+        if (isString(history_name)) {
+            current_history = history_name = history_name.replace(/\/$/, '') + "/";
+        }
+        if (target_body) body = target_body;
+    }
+    if (emptyState !== false && !history[current_history]) root_path = (history[current_history] = [].concat(emptyState || ":empty"))[0];
 };
 popup.global = zimoli.global = addGlobal;
 popup.go = zimoli.go = go;

package/package.json

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