efront 3.8.7 → 3.9.4

package/apps/pivot/api.yml

@@ -6,3 +6,5 @@
   cluster: options ::cluster-:opt?:id
   list: options :::type
   edit: options :::type-:key?:value
+  params: options ::params-:key
+  invoke: options ::invoke-:key?:params

package/apps/pivot/auth/login.js

@@ -13,7 +13,8 @@ function main() {
     });
     renderWithDefaults(page, {
         fields, data: {
-            host: location.host,
+            host: data.getInstance("base").host || location.host,
+
         }, pending: false
     });
     on("submit")(page, async function () {
@@ -24,14 +25,10 @@ function main() {
         try {
             var login = await data.getApi("login");
             login.base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";
-            cross.addDirect(login.base);
+            data.setInstance("base", { base: login.base, host: parseURL(login.base).host });
             var info = await data.from(login, {
                 a: encode62.timeencode(encode62.geta(password))
             }).loading_promise;
-            var apimap = await data.getConfig();
-            for (var k in apimap) {
-                apimap[k].base = login.base;
-            }
             info = encode62.timeupdate(info);
             data.setSource({ authorization: info });
             user.login({})

package/apps/pivot/main.js

@@ -4,6 +4,13 @@ var token = data.getSource('authorization');
 if (token) {
     user.login({});
 }
+data.bindInstance("base", async function (base) {
+    cross.addDirect(base.base);
+    var apimap = await data.getConfig();
+    for (var k in apimap) {
+        apimap[k].base = base.base;
+    }
+});
 setInterval(function () {
     var auth = data.getSource('authorization');
     if (!auth) return;

package/apps/pivot/task/invoke.html

@@ -0,0 +1,17 @@
+<div head>
+    <span -text="task.name"></span>
+    (<span -text="task.key"></span>)
+    <close @click="remove()"></close>
+</div>
+<div body>
+    <div class="left">
+        <field -repeat="f in fields" -src="[f,data]"></field>
+        <pre -text="task.code"></pre>
+    </div>
+    <div class="right" :class="{error:error}">
+        <pre -text="output"></pre>
+    </div>
+</div>
+<div foot>
+    <btn @click="run">执行</btn>
+</div>

package/apps/pivot/task/invoke.js

@@ -0,0 +1,37 @@
+function main(a) {
+    var page = view();
+    page.innerHTML = template;
+    drag.on(page.firstChild, page);
+    var fields = data.from("params", { key: a.key }, function (a) {
+        return a ? JSON.parse(encode62.timedecode(a)) : [];
+    });
+    var taskid = 0;
+    renderWithDefaults(page, {
+        remove() {
+            remove(page);
+        },
+        data: {},
+        fields: fields,
+        task: a,
+        output: '',
+        error: false,
+        async run() {
+            var id = ++taskid;
+            this.output = "正在执行..";
+            this.error = false;
+            var params = JSON.stringify(this.data);
+            try {
+                var res = await data.from("invoke", { key: a.key, params: encode62.timeencode(params) }, function (a) {
+                    return a ? encode62.timedecode(a) : '完成！';
+                });
+                if (id !== taskid) return;
+                this.output = res;
+            } catch (e) {
+                this.output = String(e);
+                this.error = true;
+            }
+        }
+    });
+    resize.on(page);
+    return page;
+}

package/apps/pivot/task/invoke.less

@@ -0,0 +1,23 @@
+& {
+    position: absolute;
+    width: 800px;
+}
+
+>[body]>div {
+    display: inline-block;
+    width: 50%;
+    vertical-align: top;
+    overflow: auto;
+    font-size: 12px;
+    border-bottom: 50px solid transparent;
+    padding: 0 10px;
+
+    &.right {
+        background: #000;
+        color: #fff;
+        height: 100%;
+    }
+    &.error{
+        color: #c26;
+    }
+}

package/apps/pivot/task/list.js

@@ -1,6 +1,14 @@
 plist.bind(null, '任务管理', "task", refilm`
 *任务ID/key 100
 *任务名/name 100
-*启用/status swap [关闭,开启]
+*是否启用/status radio [不启用,启用]
 任务代码/code text
+执行/ - ${[{
+        when(o) {
+            return o.status === 1;
+        },
+        name: "执行", do(o) {
+            popup("/task/invoke", o);
+        }
+    }]}
 `, '/task/edit');

package/coms/basic/loader.js

@@ -507,7 +507,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
             result = res;
             created = true;
             _ok(res);
-        }, prebuilds);
+        });
         if (created) return result;
         return promise;
     });

package/coms/basic/refilm_decode.js

@@ -320,7 +320,7 @@ function parse(piece) {
                     name = name.slice(0, commaindex);
                 }
             }
-            [name, key] = scanSlant(name, '/');
+            [name, key] = scanSlant(name, '/', 0, name.length + 1);
             if (key === undefined && !/^(title|label|headline)$/i.test(type)) key = name;
         }
         if (/^[a-z\d]+\/?\d+$/i.test(type)) {

package/coms/basic/renderExpress.js

@@ -0,0 +1,101 @@
+function createSeek(express) {
+    var dist;
+    express.forEach(function (search) {
+        if (dist) {
+            if (/[\=]/.test(dist)) dist = `(${dist})`;
+            dist = `${dist}!==void 0&&${dist}!==null?${dist}${search}:''`
+        } else {
+            dist = search;
+        }
+    });
+    return dist;
+}
+function main(express) {
+    if (!/\?\s*\.(?=[^\d])/.test(express)) return express;
+    var reg = /\\[\s\S]|\?\s*(\.(?!\d))|[\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\[\]\(\)'"`\s]/g;
+    var cache = [], queue = [];
+    var exp = [];
+    var instr = false;
+    var lastIndex = 0;
+    var add_exp = function (s) {
+        if (!exp.length) exp.push(s);
+        else {
+            var e = exp[exp.length - 1];
+            if (!/[\.]\s*$/.test(e) && !/^\s*[\.'"`\[\(]/.test(s)) {
+                queue.push(createSeek(exp));
+                exp.splice(0, exp.length, '');
+                e = '';
+            }
+            if (/\.$/.test(e) && /^[\[\("'`]/.test(s)) {
+                e = e.replace(/\.$/, '');
+            }
+            e += s;
+            exp[exp.length - 1] = e;
+        }
+    };
+    var push_quote = function (m) {
+        add_exp(m);
+        cache.push(queue, exp);
+        queue = [];
+        exp = [];
+    };
+    var pop_quote = function (m) {
+        add_punc('');
+        exp = cache.pop();
+        var e = queue.join("") + m;
+        exp[exp.length - 1] += e;
+        queue = cache.pop();
+    };
+    var add_punc = function (m) {
+        if (exp.length) {
+            var temp = createSeek(exp);
+            queue.push(exp.length > 1 ? `(${temp})` : temp, m);
+            exp = [];
+        } else if (queue.length) {
+            queue[queue.length - 1] += m;
+        } else {
+            queue.push(m);
+        }
+    };
+
+    do {
+        var match = reg.exec(express);
+        if (!match) break;
+        var index = match.index;
+        var m = match[0];
+        var isstr = false;
+        if (/['"`\/]/.test(m)) {
+            if (instr === m) instr = false;
+            else if (!instr) instr = m;
+        }
+        if (instr) {
+            continue;
+        }
+        if (/['"`\/\s]/.test(m)) {
+            isstr = true;
+            index++;
+        }
+
+        var str = express.slice(lastIndex, index);
+        if (str) {
+            add_exp(str);
+        }
+        lastIndex = match.index + m.length;
+        if (match[1]) {
+            exp.push(match[1]);
+        }
+        else if (/[\[\{\(]/.test(m)) {
+            push_quote(m);
+        }
+        else if (/[\]\}\)]/.test(m)) {
+            pop_quote(m);
+        }
+        else if (!isstr) {
+            add_punc(m);
+        }
+    } while (true);
+    var s = express.slice(lastIndex);
+    if (s) add_exp(s);
+    add_punc('');
+    return queue.join("");
+}

package/coms/crypt/encode62.js

@@ -43,7 +43,7 @@ Object.assign(encode62, {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
-        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
         return this.encode62(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {

package/coms/frame/edit.html

@@ -2,7 +2,7 @@
     <span v-text="origin?'修改':'添加'"></span><span -text="title"></span>
 </div>
 <div body>
-    <field v-if="!f.readonly||!!data[f.key]" -repeat="f in fields" ng-src="[f,data]"></field>
+    <field v-if="!f.hidden" -repeat="f in fields" ng-src="[f,data]"></field>
 </div>
 <div foot>
     <btn @click="remove()" class="white">取消</btn>

package/coms/zimoli/colorlabel.less

@@ -1,5 +1,5 @@
 & {
-    width: 180px;
+    width: 160px;
     height: 20px;
     display: inline-block;
     text-align: center;

package/coms/zimoli/colorpicker.js

@@ -2,7 +2,8 @@ function main(element = document.createElement("div")) {
     element.innerHTML = colorpicker;
     var saved_value;
     var selector = element.firstChild;
-    select(selector, colorpad(), false, 'y');
+    var pad = colorpad();
+    select(selector, pad, false, 'y');
     render(element, {
         a: button,
         colorlabel,
@@ -25,6 +26,7 @@ function main(element = document.createElement("div")) {
     element.setValue = function (value) {
         element.value = value;
         cast(selector, value);
+        pad.setValue(value);
     };
     return element;
 }

package/coms/zimoli/data.js

@@ -73,7 +73,7 @@ const formulaters = {
     }
 };
 
-function getErrorMessage(error) {
+function getErrorMessage(error = this) {
     if (!isObject(error)) return String(error);
     if (error instanceof Error) return String(error);
     var words = "reason,message,desc,descption,msg,err,error,data".split(',');
@@ -550,7 +550,7 @@ var privates = {
                 }).error(xhr => {
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
-                        oh({ status: xhr.status, error: e })
+                        oh({ status: xhr.status, error: e, toString: getErrorMessage })
                     } catch (error) {
                         oh(error);
                     }

package/coms/zimoli/encode62.js

@@ -33,7 +33,7 @@ var encode62 = {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
-        string = encodeURIComponent(string).replace(/\./g, '..').replace(/%/g, '.');
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
         return this.encode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {

package/coms/zimoli/getName.js

@@ -0,0 +1,9 @@
+var hasOwnProperty = {}.hasOwnProperty;
+function getName(o) {
+    if (hasOwnProperty.call(o, 'toString')) return o.toString();
+    if ("name" in o) return o.name;
+    if ("label" in o) return o.label;
+    if ("value" in o) return o.value;
+    if (hasOwnProperty.call(o, 'valueOf')) return o.valueOf();
+    return o;
+}

package/coms/zimoli/getValue.js

@@ -1,4 +1,11 @@
-function getValue() {
-    if (isFunction(this.getValue)) return this.getValue();
-    return this.value;
+var hasOwnProperty = {}.hasOwnProperty;
+function getValue(o = this) {
+    if (!o) return o;
+    if (isFunction(o.getValue)) return o.getValue();
+    if (hasOwnProperty.call(o, 'valueOf')) return o.valueOf();
+    if ("key" in o) return o.key;
+    if ("value" in o) return o.value;
+    if (hasOwnProperty.call(o, 'toString')) return o.toString();
+    if (!isEmpty(o.id)) return o.id;
+    return o;
 }

package/coms/zimoli/model.js

@@ -12,6 +12,7 @@ var rebuildOptions = function () {
     var new_options = seek(data, options_from);
     if (new_options !== options) {
         field.options = new_options;
+        delete field.optionsMap;
         render.refresh();
     }
 };
@@ -198,7 +199,22 @@ function main(elem) {
                     elem.innerHTML = '<span ng-bind=get()></span>';
                     render(elem, {
                         get() {
-                            return seek(data, field.key);
+                            var value = seek(data, field.key);
+                            if (field.options) {
+                                if (!field.optionsMap) {
+                                    var map = Object.create(null);
+                                    for (var o of field.options) {
+                                        var v = getValue(o);
+                                        map[v] = o;
+                                    }
+                                    field.optionsMap = map;
+                                }
+                                var map = field.optionsMap;
+                                if (value in map) {
+                                    value = getName(map[value]);
+                                }
+                            }
+                            return value;
                         }
                     });
                 }

package/coms/zimoli/prepare.js

@@ -0,0 +1 @@
+zimoli.prepare;

package/coms/zimoli/radio.js

@@ -18,18 +18,18 @@ function main(elem = document.createElement("radio-group")) {
             options,
             select(a) {
                 this.options.active = a;
-                elem.value = a.key;
+                elem.value = getValue(a);
                 dispatch(elem, 'change');
             }
         });
-        if (elem.value) {
+        if (!isEmpty(elem.value)) {
             elem.setValue(elem.value);
         }
     });
     elem.setValue = function (key) {
         var { options } = this.$scope;
         if (!(options instanceof Array)) return;
-        var index = options.map(a => a.key).indexOf(key);
+        var index = options.map(a => getValue(a)).indexOf(key);
         options.active = options[index];
     };
     return elem;

package/coms/zimoli/render.js

@@ -56,20 +56,7 @@ var createGetter = function (search, isprop = true) {
     var [withContext, searchContext] = search;
     if (!searchContext) return function () { };
     var ret = /\;/.test(searchContext) ? "" : "return ";
-    if (/\?\s*\.(?=[^\d])/.test(searchContext)) {
-        searchContext = searchContext.replace(variableReg, function (context) {
-            var dist;
-            context.split(/\?\s*\.(?=[^\d])/).forEach(function (search) {
-                if (dist) {
-                    if (/[\=]/.test(dist)) dist = `(${dist})`;
-                    dist = `${dist}!==void 0&&${dist}!==null?${dist}.${search}:''`
-                } else {
-                    dist = search;
-                }
-            });
-            return dist.length > 1 ? `(${dist})` : context;
-        });
-    }
+    searchContext = renderExpress(searchContext);
     if (isprop) {
         return new Function('event', `${withContext}with(this.$scope){${ret}${searchContext}}`);
     }
@@ -94,7 +81,7 @@ var parseRepeat = function (expression) {
     var res = reg.exec(expression);
     if (!res) return res;
     var [_, i, k, r, s, t] = res;
-    var keyName, itemName, indexName, trackBy = t, srcName = s;
+    var keyName, itemName, indexName, trackBy = t, srcName = renderExpress(s);
     switch (r) {
         case "in":
             if (i) itemName = i;
@@ -289,6 +276,7 @@ var parseIfWithRepeat = function (ifExpression, repeatExpression) {
         if (reg.lastIndex < savedIndex) break;
         run();
     }
+    if (savedIndex < ifExpression.length) rest.push(ifExpression.slice(savedIndex))
     var beforeRepeat = [], afterRepeat = [];
     rest.forEach(function (result) {
         var match = false;

package/coms/zimoli/table.html

@@ -9,7 +9,7 @@
     <tr>
         <td -repeat="f in fields">
             <model -if="f.key" :field=f :data=d readonly ></model>
-            <a on-click="o.do(d)" -if="!f.key&&f.options" _type="o.type instanceof Function?o.type(d):o.type"
+            <a on-click="o.do(d)" -if="!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/zimoli.js

@@ -185,32 +185,8 @@ var loading_tree = {};
 var getpgpath = function (pagepath) {
     return /^[@#!]/.test(pagepath) ? pagepath.slice(1) : pagepath;
 };
-function prepare(pgpath, ok) {
+function createState(pgpath) {
     var pgpath = getpgpath(pgpath);
-    if (page_generators[pgpath]) {
-        if (isFunction(ok)) {
-            var res = page_generators[pgpath];
-            if (!res.roles) {
-                ok(res);
-            } else {
-                prepare(user.loginPath, _ => {
-                    ok(res);
-                });
-            }
-        }
-        return;
-    }
-    if (loading_tree[pgpath]) {
-        if (isFunction(ok)) {
-            loading_tree[pgpath].push(ok);
-        }
-        return;
-    }
-    loading_tree[pgpath] = [];
-    if (isFunction(ok)) {
-        loading_tree[pgpath].push(ok);
-    }
-
     var _zimoli_state_key = _zimoli_state_prefix + pgpath;
     var state = function state(condition, setAsAdditional = condition !== null) {
         var state_string = hostoryStorage.getItem(_zimoli_state_key);
@@ -242,6 +218,34 @@ function prepare(pgpath, ok) {
         }
         return state_object;
     };
+    return state;
+}
+function prepare(pgpath, ok) {
+    var pgpath = getpgpath(pgpath);
+    if (page_generators[pgpath]) {
+        if (isFunction(ok)) {
+            var res = page_generators[pgpath];
+            if (!res.roles) {
+                ok(res);
+            } else {
+                prepare(user.loginPath, _ => {
+                    ok(res);
+                });
+            }
+        }
+        return;
+    }
+    if (loading_tree[pgpath]) {
+        if (isFunction(ok)) {
+            loading_tree[pgpath].push(ok);
+        }
+        return;
+    }
+    loading_tree[pgpath] = [];
+    if (isFunction(ok)) {
+        loading_tree[pgpath].push(ok);
+    }
+    var state = createState(pgpath);
     state.state = state;
     var _with_elements = [];
     state.with = function (element) {
@@ -299,6 +303,7 @@ function prepare(pgpath, ok) {
             return Promise.resolve(res);
         };
     });
+
     var prepares = [];
     state.prepare = state.go.prepare = function (urls) {
         prepares.push.apply(prepares, [].concat(urls).map(state.path));
@@ -352,8 +357,8 @@ function prepare(pgpath, ok) {
         delete loading_tree[pgpath];
     };
     return init(pgpath, function (pg) {
-
         if (!pg) return;
+        extendIfNeeded(pg, state);
         if (roles) return prepare(user.loginPath, () => emit(pg));
         emit(pg);
     }, state);
@@ -654,4 +659,5 @@ zimoli.clearHistory = function () {
 zimoli.getCurrentHistory = function () {
     return history[current_history];
 };
-zimoli.inithash = locationInitHash;
+zimoli.inithash = locationInitHash;
+zimoli.createState = createState;

package/package.json

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