efront 3.9.4 → 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/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/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/package.json

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