efront 3.10.4 → 3.10.5

package/coms/zimoli/color.js

@@ -254,13 +254,15 @@ function stringify(color) {
 	}
 }
 function doWith(manager, color, args) {
-	var c = parse(color);
+	var isparsed = color instanceof Array,
+		c = isparsed ? color : parse(color);
 	if (!c) {
 		console.warn(`颜色数据不正确:${color}`);
 		return color;
 	}
 	c = manager(c, args);
-	return stringify(c);
+	if (!isparsed) c = stringify(c);
+	return c;
 }
 
 function normal([r, g, b]) {

package/coms/zimoli/data.js

@@ -962,7 +962,7 @@ var data = {
             instanceDataMap[instanceId] = data;
         }
         setItem(instanceId, data, rememberWithStorage);
-        fireListener(instanceId);
+        fireListener(instanceId, data);
         return instanceDataMap[instanceId];
     },
     patchInstance(instanceId, data, rememberWithStorage = 0) {
@@ -999,7 +999,7 @@ var data = {
         if (!~listeners.indexOf(callback)) {
             listeners.push(callback);
         }
-        callback(this.getInstance(instanceId));
+        if (hasItem(instanceId)) callback(getItem(instanceId));
     },
     unbindInstance(instanceId, callback) {
         if (!instanceListenerMap[instanceId]) return;
@@ -1047,12 +1047,14 @@ function getItem(instanceId, onlyFromLocalStorage = false) {
     }
     return data;
 }
+function hasItem(instanceId) {
+    return sessionStorage.getItem(instanceId) || localStorage.getItem(instanceId);
+}
 var instanceListenerMap = {};
-var fireListener = function (instanceId) {
+var fireListener = function (instanceId, data) {
     var listeners = instanceListenerMap[instanceId];
     if (!listeners) return;
-    var instance = instanceDataMap[instanceId];
-    listeners.forEach(a => a(instance));
+    listeners.forEach(a => a(data));
 };
 data.setItem = data.setInstance;
 data.getItem = data.getInstance;

package/package.json

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