efront 3.5.7 → 3.5.8

package/apps/pivot/api.yml

@@ -2,3 +2,4 @@
   login: options /::login-:a
   run: options /:::run
   share: options /::share-:opt
+  folder: options /::file-:opt:::path?:to

package/apps/pivot/menu.yml

@@ -1,5 +1,6 @@
 首页: /home/welcome
 共享目录管理: /share/list
 短链接: /home/short
+WEB文件管理: /wow/root
 # 用户: /home/short
 # 用户列表: /user/list

package/apps/pivot/wow/edit.html

@@ -0,0 +1,10 @@
+<div head>
+    <span v-text="origin?'修改':'添加'"></span>文件夹
+</div>
+<div body>
+    <field v-if="!f.readonly||!!data[f.key]" -repeat="f in fields" ng-src="[f,data]"></field>
+</div>
+<div foot>
+    <btn @click="remove()" class="white">取消</btn>
+    <button type="submit">保存</button>
+</div>

package/apps/pivot/wow/edit.js

@@ -0,0 +1,33 @@
+var fields = refilm`
+&原始名称/origin read
+输入新名称/name input
+`;
+function main({ path: root, name }) {
+    var a = view();
+    a.innerHTML = edit;
+    drag.on(a.firstChild, a);
+    var origin = name.replace(/\/$/, '');
+    renderWithDefaults(a, {
+        fields,
+        pathlist: root,
+        isFolder: /\/$/.test(name),
+        data: { name: origin, origin },
+        remove() {
+            remove(a);
+        },
+    });
+    on('submit')(a, async function (e) {
+        e.preventDefault();
+        var path = root.concat(a.$scope.data.name).join('/');
+        if (origin) {
+            var to = path;
+            path = origin;
+        }
+        await data.from("folder", { opt: origin ? 'mov' : 'add', path, to }).loading_promise;
+        dispatch(this, 'submited');
+    });
+    on("append")(a, lazy(function () {
+        a.querySelector("input").focus();
+    }));
+    return a;
+}

package/apps/pivot/wow/root.html

@@ -0,0 +1,10 @@
+<div class="address">
+    <input _value="pathlist.join('/')" />
+</div>
+<lattice ng-src="d in data">
+    <padding>
+        <item @click="open(d)" ng-class="{focus:active===this}">
+            <span ng-text=d.name></span>
+        </item>
+    </padding>
+</lattice>

package/apps/pivot/wow/root.js

@@ -0,0 +1,100 @@
+var fields = refilm`
+文件
+`;
+
+function main() {
+    var page = div();
+    page.innerHTML = root;
+    page.onback = function () {
+        var $scope = this.$scope;
+        if (!$scope.pathlist.length) {
+            return;
+        }
+        $scope.pathlist.pop();
+        $scope.open();
+        return false;
+    }
+    page.setAttribute('ng-mousedown', 'setActive')
+
+    renderWithDefaults(page, {
+        lattice,
+        pathlist: [],
+        active: null,
+        open(p) {
+            if (p) p = String(p.name || '').replace(/\/$/, '');
+            if (p) this.pathlist.push(p);
+            this.data = data.from("folder", { opt: 'list', path: "/" + this.pathlist.join('/') }, files => {
+                if (files) return files.map(f => {
+                    return {
+                        name: f,
+                        type: /\/$/.test(f) ? 'folder' : 'file'
+                    }
+                });
+            });
+        },
+        setActive(e) {
+            this.active = getActive(e);
+        },
+        data: [],
+    });
+    page.$scope.open();
+    var getActive = e => {
+        var p = page.querySelector('lattice');
+        var t = getTargetIn(e => e.parentNode && e.parentNode.parentNode === p, e.target);
+        return t;
+    };
+    var when = e => !!getActive(e);
+    var popupEdit = function (e) {
+        zimoli.prepare('/wow/edit', function () {
+            var p = popup("#/wow/edit", {
+                path: page.$scope.pathlist,
+                name: e || ''
+            });
+            on('submited')(p, function () {
+                page.$scope.open();
+                remove(p);
+            });
+        })
+
+    };
+    contextmenu(page, [
+        {
+            name: "新建文件夹",
+            when: e => !getActive(e),
+            do() {
+                popupEdit();
+            }
+        },
+        {
+            name: '编辑',
+            when,
+            do(e) {
+                popupEdit(e.$scope.d.name);
+            }
+        },
+        {
+            get name() {
+                return this.confirm ? "确认删除" : "删除";
+            },
+            confirm: false,
+            when(e) {
+                this.confirm = false;
+                return when(e);
+            },
+            type: "danger",
+            async do(e) {
+                if (!this.confirm) {
+                    this.confirm = true;
+                    setTimeout(_ => {
+                        this.confirm = false;
+                        render.refresh();
+                    }, 2000);
+                    return false;
+                }
+                await data.from("folder", { opt: 'del', path: "/" + page.$scope.pathlist.concat(e.$scope.d.name).join("/") }).loading_promise;
+                page.$scope.open();
+            }
+        }
+    ]);
+    return page;
+}

package/apps/pivot/wow/root.less

@@ -0,0 +1,63 @@
+& {
+    height: 100%;
+}
+
+@height: 44px;
+
+>lattice {
+    box-sizing: content-box;
+    margin-top: -@height;
+    padding-top: @height + 6px;
+
+    a {
+        vertical-align: top;
+    }
+}
+
+padding {
+    border-right-width: 60px;
+}
+
+>.address {
+    position: relative;
+    z-index: 3;
+    margin-left: 140px;
+    margin-top: -@height - 6px;
+    height: @height;
+    padding: 0 6px;
+    line-height: @height;
+
+    input {
+        width: 100%;
+    }
+}
+
+item {
+    border: 1px solid #0002;
+    position: relative;
+    display: block;
+    padding: 10px 20px;
+
+    &:hover {
+        outline: 2px solid #2cf;
+    }
+
+    &:active {
+        color: #28c;
+        outline: 2px solid;
+    }
+
+    &.focus {
+        color: #28c;
+        outline: 2px solid;
+    }
+
+    >a {
+        vertical-align: top;
+    }
+
+    >[op] {
+        left: 6px;
+        margin-left: 6px;
+    }
+}

package/coms/basic/refilm_decode.js

@@ -260,16 +260,31 @@ function parse(piece) {
     }
     var [name, type, options] = piece, key, repeat;
     if (piece.length === 1 && isObject(name)) {
-        var { name, needs, required, checks, type, key, size, unit, endwith, ratio, value, repeat, comment, options } = name;
+        var {
+            name, type, key, value, comment, options,
+            size, unit, ratio,
+            needs, checks, repeat, endwith,
+            required, inlist, hidden, readonly,
+            delete_onempty, delete_onsubmit,
+        } = name;
     } else {
-        var is_require = a => {
-            if (/^\*|\*$/.test(a)) {
-                required = true;
-                return a.replace(/^\*|\*$/, '');
+        var test = (reg,a) => {
+            if (reg.test(a)) {
+                return true;
             }
-            return a;
         };
-        type = is_require(type);
+        var is = function (a) {
+            var reg = /^[\*\+\-\!\-\$&\?\~]|[\*\+\-\!\-\$&\?\~]$/;
+            if (!reg.test(a)) return a;
+            required = test(/^\*|\*$/, a);
+            inlist = test(/^[\+\!]|[\+\!]$/, a);
+            hidden = test(/^\-|\-$/, a);
+            readonly = test(/^[\$&]|[\$&]$/, a);
+            delete_onempty = test(/^\?|\?$/, a);
+            delete_onsubmit = test(/^\~|\~$/, a);
+            return a.replace(reg, '');
+        };
+        type = is(type);
         if (typeof name === 'string') {
             if (!isContainer) {
                 if (!type) {
@@ -370,17 +385,23 @@ function parse(piece) {
             type = type.slice(1);
         }
         if (typeof options === "string") {
-            options = is_require(options);
+            options = is(options);
             var needUnfold = /^\[|\]$/.test(options);
             options = options.replace(/^\[|\]$/g, '');
             if (/,/.test(options)) options = scanSlant(options, ',');
             else options = scanSlant(options, "");
             if (needUnfold) unfoldOptions(size, options);
         }
-        name = is_require(name);
-        key = is_require(key);
+        name = is(name);
+        key = is(key);
     }
-    var field = { name, checks, required, needs, type, key, size, unit, endwith, ratio, value, repeat, comment, options };
+    var field = {
+        name, type, key, value, comment, options,
+        size, unit, ratio,
+        needs, checks, repeat, endwith,
+        required, inlist, hidden, readonly,
+        delete_onempty, delete_onsubmit,
+    };
     var parent = piecepath[piecepath.length - 1];
     if (parent) {
         field.parent = parent;

package/coms/frame/top.html

@@ -1,15 +1,15 @@
 <div class="menu-items">
     <btn class="menu-item menu-switch" ng-click=switchMenu()>
-        <i class="fa fa-bars"></i>
+        ≡
     </btn>
     <btn ng-if="fullscreen.is()" ng-click="fullscreen.exit(alert)" class="menu-switch menu-item">
-        <i class="fa fa-compress"></i>
+        ⇲
     </btn>
     <btn ng-if="fullscreen.allow&&!fullscreen.is()" ng-click=fullscreen.exec() class="menu-switch menu-item">
-        <i class="fa fa-expand"></i>
+        ⇱
     </btn>
-    <btn class="menu-item menu-switch" ng-click="route.reload()">
-        <i class="fa fa-refresh" ng-class="{'fa-pulse':data.loading_count>0}"></i>
+    <btn class="menu-item menu-switch"  ng-class="{'load':data.loading_count>0}" ng-click="route.reload()">
+        ↻
     </btn>
     <btn class="menu-item" @title="option.name" ng-click="open(option)" ng-repeat="option in options" pop>
         <i class="fa" ng-class="option.icon"></i>

package/coms/frame/top.less

@@ -166,4 +166,26 @@
         width: 50px;
         margin: 5px;
     }
+}
+
+btn {
+    vertical-align: top;
+}
+@keyframes rotate {
+    0%{
+        transform: rotate(0deg);
+    }
+    50%{
+        transform: rotate(240deg);
+    }
+    100%{
+        transform: rotate(360deg);
+    }
+}
+.load{
+    >.label{
+        display: inline-block;
+        animation: rotate 1s infinite;
+    }
+    
 }

package/coms/zimoli/action.js

@@ -3,8 +3,7 @@ function main(config, item, params) {
         if (!config) return ok();
         if (isObject(config)) {
             if (config.do instanceof Function) {
-                config.do();
-                return;
+                return ok(config.do(item, params));
             }
             if (config.modal) {
                 var path = isString(config.modal) ? config.modal : config.modal.path;

package/coms/zimoli/autodragchildren.js

@@ -337,7 +337,7 @@ function addhook() {
     }
     if (!mousedownEvent) return;
     var target = targetElement || mousedownEvent.currentTarget;
-    hooka(function (target) {
+    hooka.call(targetElement, function (target) {
         var res = [].filter.call(allowdrops || (matcher ? matcher(target) : document.querySelectorAll("[allowdrop]")), function (child) {
             return target && overlap(child, target);
         }).filter(e => {

package/coms/zimoli/button.less

@@ -14,9 +14,9 @@
     display: inline-block;
     white-space: nowrap;
     text-align: center;
-    // cursor: default;
     overflow: hidden;
     outline: none;
+    user-select: none;
 }
 >.label{
     position: relative;
@@ -177,7 +177,6 @@
 
 a&,
 &[type$=anchor] {
-    padding: 0;
     box-shadow: none;
     text-shadow: none;
     background: none;

package/coms/zimoli/contextmenu.js

@@ -3,23 +3,28 @@ var createMenu = function (event, items) {
     var menulist = sampleElement.cloneNode();
     menulist.setAttribute("mode", "v");
     menulist.tabIndex = 0;
-
-    var elem = menuList(menulist, items, function () {
-        if (action.apply(this, arguments) !== false) {
+    items = items.filter(item => {
+        if (!item.when) return true;
+        if (!item.when(event)) return false;
+        return true;
+    });
+    var elem = menuList(menulist, items, async function (item) {
+        if (await action.call(this, item, event.target) !== false) {
             remove(elem);
         }
     });
 
     return elem;
 }
-function contextmenu(target, menu) {
+function contextmenu(target, menuItems) {
     on("contextmenu")(target, function (event) {
         event.preventDefault();
-        if (menu instanceof Function) {
-            menu = menu.call(this, event);
+        var menu;
+        if (menuItems instanceof Function) {
+            menu = menuItems.call(this, event);
         }
-        if (menu instanceof Array) {
-            menu = createMenu.call(this, event, menu);
+        if (menuItems instanceof Array) {
+            menu = createMenu.call(this, event, menuItems);
         }
         if (!menu) return;
         css(menu, {

package/coms/zimoli/cross.js

@@ -175,8 +175,8 @@ function cross(method, url, headers) {
                             onerror({ status: "网络断开" });
                             break;
                         }
-                        if (!navigator.response) {
-                            onerror({ status: "服务器无响应" });
+                        if (!xhr.response) {
+                            onerror({ status: "无法访问服务器" });
                             break;
                         }
                     case 200:
@@ -268,7 +268,7 @@ function cross(method, url, headers) {
         var then = xhr.then;
         delete xhr.then;
         if (loaded) onloads.splice(0, onloads.length).map(e => e instanceof Function && e(xhr));
-        if (errored) onerrors.splice(0, onerrors.length).map(e => e instanceof Function && e(xhr));
+        if (errored) onerrors.splice(0, onerrors.length).map(e => e instanceof Function && e(errored));
         xhr.then = then;
     };
     var onloads = [], onerrors = [];

package/coms/zimoli/field.js

@@ -16,7 +16,7 @@ function main(elem) {
     }, false);
     elem.setAttribute("field", '');
     elem.renders = [function () {
-        if (!this.src) return;
+        if (!(this.src instanceof Array)) return;
         var [f, data] = this.src;
         if (!f || !data) return;
         var v = data[f.key];

package/coms/zimoli/menuList.html

@@ -1,3 +1,4 @@
-<menu-item ng-repeat="menu in menus" ng-click="open(menu,event)" ng-mouseleave="clearTimeout(popTimer)"
-    ng-mouseenter="popTimer=popMenu(menu,event)" ng-class="{'has-children':menu.children&&menu.children.length}">
+<menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open(menu,event)"
+    ng-mouseleave="clearTimeout(popTimer)" ng-mouseenter="popTimer=popMenu(menu,event)"
+    ng-class="{'has-children':menu.children&&menu.children.length,'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red'}">
 </menu-item>

package/coms/zimoli/menuList.less

@@ -1,38 +1,42 @@
 & {
-    display         : inline-block;
-    width           : auto;
-    height          : auto;
+    display: inline-block;
+    width: auto;
+    height: auto;
     background-color: #fff;
-    box-shadow      : 0 0 20px -6px rgba(0, 0, 0, .6);
-    line-height     : 28px;
-    padding         : 6px 0;
+    box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
+    border: 1px solid #0003;
+    line-height: 28px;
+    padding: 6px 0;
 
     >menu-item {
-        display         : block;
-        position        : relative;
-        padding         : 0 16px;
-        border-radius   : 0;
+        display: block;
+        position: relative;
+        padding: 0 16px;
+        border-radius: 0;
         background-color: inherit;
-        color           : inherit;
-        box-shadow      : none;
-        text-align      : inherit;
+        color: inherit;
+        box-shadow: none;
+        text-align: inherit;
+        &.warn{
+            color: #c28;
+        }
 
         &.has-children {
             padding: 0 24px 0 16px;
 
             &:after {
-                content    : ">";
-                display    : block;
-                width      : 20px;
-                height     : 20px;
+                content: ">";
+                display: block;
+                width: 20px;
+                height: 20px;
                 line-height: 20px;
-                font-size  : 18px;
-                transform  : scaleX(.56);
-                position   : absolute;
-                right      : 6px;
-                top        : 50%;
-                margin-top : -10px;
-                text-align : right;
+                font-size: 18px;
+                transform: scaleX(.56);
+                position: absolute;
+                right: 6px;
+                top: 50%;
+                margin-top: -10px;
+                text-align: right;
             }
         }
 
@@ -41,5 +45,5 @@
 
 i {
     display: inline-block;
-    width  : 20px;
+    width: 20px;
 }

package/coms/zimoli/model.js

@@ -142,7 +142,7 @@ function main(elem) {
                 elem.setAttribute("type", field_type);
             }
             remove(elem.children);
-            if (readonly) {
+            if (readonly || field.readonly) {
                 if (field_type === "function") {
                     field_editor(elem);
                 } else {

package/coms/zimoli/render.js

@@ -51,7 +51,7 @@ function rebuild(element) {
         dispatch(event, element);
     }
 }
-var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s]|\?\s*\.(?=[^\d])|\s*\.\s*)+/g;
+var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s\[\]\(\)]|\?\s*\.(?=[^\d])|\s*\.\s*)+/g;
 var createGetter = function (search, isprop = true) {
     var [withContext, searchContext] = search;
     if (!searchContext) return function () { };
@@ -62,12 +62,12 @@ var createGetter = function (search, isprop = true) {
             context.split(/\?\s*\.(?=[^\d])/).forEach(function (search) {
                 if (dist) {
                     if (/[\=]/.test(dist)) dist = `(${dist})`;
-                    dist = `${dist}!==void 0&&${dist}!==null?${dist}.${search}:null`
+                    dist = `${dist}!==void 0&&${dist}!==null?${dist}.${search}:''`
                 } else {
                     dist = search;
                 }
             });
-            return context.length > 1 ? `(${dist})` : context;
+            return dist.length > 1 ? `(${dist})` : context;
         });
     }
     if (isprop) {
@@ -723,7 +723,7 @@ function renderStructure(element, scope, parentScopes = []) {
             }
             if (!element.renderid) element.renderid = -1;
             else element.renderid = -2;
-            // element.removeAttribute(name);
+            continue;
         }
         if (element.$struct) continue;
         var key = name.replace(/^(ng|v|.*?)\-|^[\:\_\.]|^v\-bind\:/i, "").toLowerCase();

package/package.json

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