efront 3.9.0 → 3.9.8

package/apps/pivot/api.yml

@@ -8,3 +8,4 @@
   edit: options :::type-:key?:value
   params: options ::params-:key
   invoke: options ::invoke-:key?:params
+  version: options ::version

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/home/welcome.html

@@ -15,4 +15,9 @@
     <padding>
         退出登录 <btn @click="logout()">退出</btn>
     </padding>
+</block>
+<block>
+    <padding>
+        服务器版本&nbsp;&nbsp;<span -text="String(version)"></span>
+    </padding>
 </block>

package/apps/pivot/home/welcome.js

@@ -3,6 +3,7 @@ function main() {
     page.innerHTML = template;
     renderWithDefaults(page, {
         status: [],
+        version: data.from("version"),
         async run(id, target) {
             target.setAttribute('pending', '')
             try {

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

@@ -8,7 +8,7 @@
         <field -repeat="f in fields" -src="[f,data]"></field>
         <pre -text="task.code"></pre>
     </div>
-    <div class="right">
+    <div class="right" :class="{error:error}">
         <pre -text="output"></pre>
     </div>
 </div>

package/apps/pivot/task/invoke.js

@@ -3,7 +3,7 @@ function main(a) {
     page.innerHTML = template;
     drag.on(page.firstChild, page);
     var fields = data.from("params", { key: a.key }, function (a) {
-        return JSON.parse(encode62.timedecode(a));
+        return a ? JSON.parse(encode62.timedecode(a)) : [];
     });
     var taskid = 0;
     renderWithDefaults(page, {
@@ -14,16 +14,24 @@ function main(a) {
         fields: fields,
         task: a,
         output: '',
+        error: false,
         async run() {
             var id = ++taskid;
+            this.output = "正在执行..";
+            this.error = false;
             var params = JSON.stringify(this.data);
-            var res = await data.from("invoke", { key: a.key, params: encode62.timeencode(params) }, function (a) {
-                return encode62.timedecode(a);
-            });
-            console.log(res);
-            if (id !== taskid) return;
-            this.output = res;
+            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

@@ -7,4 +7,17 @@
     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/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/layer/glance.less

@@ -22,6 +22,8 @@
     height: 100%;
     position: absolute;
     top: 0;
+    left: 0;
+    display: block;
 }
 
 

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);
                     }
@@ -621,7 +621,7 @@ function responseCrash(e, data) {
     }
     error_report(data.error_message, e.status < 500 ? 'warn' : 'error');
 }
-
+var getData = function () { return this.data };
 var data = {
     decodeStructure,
     encodeStructure,
@@ -898,12 +898,11 @@ var data = {
     getInstance(instanceId, onlyFromLocalStorage = false) {
         if (!instanceDataMap[instanceId]) {
             var data = getItem(instanceId, onlyFromLocalStorage);
-            if (isObject(data) || isEmpty(data)) {
-                data = extend(new LoadingArray, data);
-                data.is_loading = false;
-                data.is_loaded = true;
-            }
-            instanceDataMap[instanceId] = data;
+            var instance = new LoadingArray;
+            this.rebuildInstance(instance, data);
+            instance.is_loading = false;
+            instance.is_loaded = true;
+            instanceDataMap[instanceId] = instance;
         }
         return instanceDataMap[instanceId];
 
@@ -947,7 +946,7 @@ var data = {
      */
     setInstance(instanceId, data, rememberWithStorage = 0) {
         const instance = this.getInstance(instanceId);
-        if (isObject(data) && isObject(instance)) {
+        if (isObject(instance)) {
             this.rebuildInstance(instance, data);
         } else {
             instanceDataMap[instanceId] = data;
@@ -1005,7 +1004,8 @@ var data = {
     },
     rebuildInstance(instance, data, old = instance) {
         if (instance === data) return;
-        if (!isObject(instance) || !isObject(data)) throw new Error("只支持object类型的数据！");
+        if (!isObject(instance)) throw new Error("只支持object类型的数据！");
+        if (!isObject(data)) data = { data }, data.toString = data.valueOf = getData;
         if (instance instanceof Array) instance.splice(0, instance.length);
         var sample = new LoadingArray;
         Object.keys(old).forEach(function (k) {

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