efront 4.0.53 → 4.0.55

package/coms/zimoli/autodragchildren.js

@@ -340,6 +340,17 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             offdragend();
         };
         var offdragstart = on('dragstart')(targetChild, function () {
+            var c = drag.shadow;
+            var zIndex = c.style.zIndex - 1;
+            var copyZIndex = function (e) {
+                e.style.zIndex = zIndex;
+                var z = zIndex - 1;
+                if (e.with) for (var w of e.with) w.style.zIndex = z;
+            };
+            if (zIndex > 2) {
+                previousElements.forEach(copyZIndex);
+                followedElements.forEach(copyZIndex);
+            }
             setOpacity(targetBox, draggingSourceOpacity);
         });
         var offdragend = on("dragend")(targetChild, function () {
@@ -350,6 +361,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             remove(followedElements);
             previousElements.map(recover);
             followedElements.map(recover);
+            previousElements.splice(0, previousElements.length);
+            followedElements.splice(0, followedElements.length);
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }

package/coms/zimoli/button.less

@@ -88,7 +88,6 @@
 
 &>.track {
     border-radius: inherit;
-    transition: box-shadow .1s, background-color .2s;
     width: 100%;
     height: 100%;
     position: absolute;

package/coms/zimoli/cloneVisible.js

@@ -1,4 +1,4 @@
-var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace,lineHeight".split(",");// text-node
+var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace".split(",");// text-node
 var cloneProperties2 = "position,backdropFilter,filter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,textOverflow,wordBreak,webkitLineClamp,webkitBoxOrient,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");// element
 var pushProperty = function (key, props) {
     props.split(",").forEach(k => {

package/coms/zimoli/contextmenu.less

@@ -1,4 +1,5 @@
 & {
     cursor: default;
     outline: none;
+    max-height: 50%;
 }

package/coms/zimoli/drag.js

@@ -76,6 +76,7 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
                 extraTargets = [];
                 if (target.style) css(target, { zIndex: z });
             }
+            drag.shadow = clone;
             var [clone_left, clone_top] = getOffset(clone);
             extraClones = extraTargets.map(toCloneTarget);
             extraClones.forEach(addZIndex);

package/coms/zimoli/maps_test.less

@@ -7,9 +7,14 @@
     background-position: 0 0, @background-size/2 @background-size/2;
     height: 200px;
 }
-
+menu{
+    left: 0;
+    width: 100%;
+    appearance: none;
+    display: block;
+}
 canvas {
     width: 100%;
-    height: 100%;
+    height: 300px;
     background-color: #035;
 }

package/coms/zimoli/model.js

@@ -257,7 +257,7 @@ function main(elem) {
                     elem.innerHTML = '<span ng-bind=get()></span>';
                     render(elem, {
                         get() {
-                            if (!field.key) return;
+                            if (isEmpty(field.key)) return;
                             var value = seek(data, field.key);
                             if (field.options) {
                                 if (!field.optionsMap) {

package/coms/zimoli/table.html

@@ -13,9 +13,9 @@
         <td fixed row-index -bind="i+1" :style="adapter.firstChild.getAttribute('style')">
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">
-            <model -if="f.key&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
+            <model -if="!isEmpty(f.key)&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
-            <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"
+            <a on-click="o.do(d)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
                 _type="o.type instanceof Function?o.type(d):o.type" -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>

package/coms/zimoli/table.js

@@ -371,28 +371,23 @@ var getTdsOfSameRow = function (td) {
     return tds;
 };
 function setContextMenu(thead) {
-    var fields = this.fields.slice();
-    var scope = this;
-    var menuItems = fields.map(f => {
-        return {
-            name: f.name || " ",
-            checked: !f.hidden,
-            width: f.width,
-            do() {
-                this.checked = !this.checked;
-                f.hidden = !this.checked;
-                scope.fields = fields.filter(f => !f.hidden);
-                var width = thead.scrollWidth / scope.fields.length;
-                if (!width || width < 200) width = 200;
-                forEachRow(thead, function (tr) {
-                    for (var td of tr.children) {
-                        if (td.offsetWidth > width) css(td, { width });
-                    }
-                });
-                setLazyFixedColumn.call(thead.parentNode, true)
+    var fields = this.originFields.slice();
+    var _do = function () {
+        this.checked = !this.checked;
+        var f = fields[this.index];
+        f.hidden = !this.checked;
+        scope.fields = fields.filter(f => !f.hidden);
+        var width = thead.scrollWidth / scope.fields.length;
+        if (!width || width < 200) width = 200;
+        forEachRow(thead, function (tr) {
+            for (var td of tr.children) {
+                if (td.offsetWidth > width) css(td, { width });
             }
-        }
-    });
+        });
+        setLazyFixedColumn.call(thead.parentNode, true)
+    };
+    var menuItems = fields.map((f, i) => ({ name: f.name || "&nbsp", index: i, width: f.width, key: f.key, checked: !f.hidden, do: _do }));
+    var scope = this;
     contextmenu(thead, menuItems);
 }
 function table(elem) {
@@ -468,11 +463,19 @@ function table(elem) {
         };
         vbox(table, 'x');
     };
-    care(table, async function ([fields, data]) {
+    care(table, async function (src) {
+        if (src instanceof Table) {
+            data = src;
+            fields = data.fields;
+        }
+        else if (src instanceof Array) {
+            var [fields, data] = src;
+        }
+        else throw new Error("table组件源数据错误！");
         if (_vbox) _vbox(), _vbox = null;
         watch(table, {
             find(text) {
-                if ($scope.data.constructor === Table){
+                if ($scope.data.constructor === Table) {
                     $scope.data.searchText = text;
                     $scope.data.update();
                 }
@@ -485,7 +488,8 @@ function table(elem) {
         markedRows = false;
         this.style.display = 'block';
         var $scope = {
-            fields,
+            originFields: fields,
+            fields: fields.filter(f => !f.hidden),
             isEmpty,
             hasFoot: true,
             setContextMenu,

package/docs/main.xht

@@ -42,7 +42,7 @@
         content: "样";
     }
 
-    menu {
+    :root>menu {
         margin: 0;
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);

package/docs/mark.xht

@@ -2,8 +2,52 @@
     :scope {
         line-height: 1.8;
         display: block;
-        padding: 0 20px;
         font-family: Times, "宋体", sans-serif;
+
+        @media screen and (max-width:830px) {
+            padding: 20px 40px;
+        }
+
+        @media screen and (min-width:1160px) {
+            margin: 20px auto;
+        }
+
+        @media screen and (min-width:830px) {
+            max-width: 890px;
+            border: 1px solid #000;
+            padding: 60px 80px;
+            box-shadow: 0 0 20px -6px #0006;
+        }
+    }
+
+    code {
+        width: 100%;
+    }
+
+    table {
+        margin-top: 12px;
+    }
+
+    thead {
+        font-weight: 900;
+        text-align: center;
+
+        td {
+            border-bottom: 1px solid #000;
+        }
+    }
+
+    ol,
+    ul {
+        padding-left: 20px;
+    }
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5 {
+        border-bottom: 1px solid #000;
     }
 
     [type="xml"] stamp,
@@ -54,7 +98,6 @@
         border-collapse: collapse;
         border: 1.2px solid #0007;
     }
-
 </style>
 <script>
     var history = [];

package/package.json

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