efront 3.9.2 → 3.9.10

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/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/task/invoke.html

@@ -4,8 +4,10 @@
     <close @click="remove()"></close>
 </div>
 <div body>
-    <div class="left">
+    <div class="top">
         <field -repeat="f in fields" -src="[f,data]"></field>
+    </div>
+    <div class="left">
         <pre -text="task.code"></pre>
     </div>
     <div class="right" :class="{error:error}">

package/apps/pivot/task/invoke.less

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

package/coms/basic/loader.js

@@ -503,11 +503,19 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         var promise = new Promise(function (ok) {
             _ok = ok;
         });
+        if (prebuilds.init) {
+            var prebuilds2 = Object.create(null);
+            for (var k in prebuilds) prebuilds2[k] = prebuilds[k];
+            prebuilds = prebuilds2;
+            delete prebuilds.popup;
+            delete prebuilds.action;
+            delete prebuilds.init;
+        }
         init(argName, function (res) {
             result = res;
             created = true;
             _ok(res);
-        });
+        }, prebuilds);
         if (created) return result;
         return promise;
     });

package/coms/layer/glance.less

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

package/coms/zimoli/data.js

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