efront 3.20.2 → 3.20.3

package/coms/basic/cookie.js

@@ -23,6 +23,7 @@ var parseCookieFromText = function (cookie) {
 };
 
 function addCookie(cookie_text, originDomain = "") {
+    originDomain = getDomainPath(originDomain);
     if (!cookie_text) return;
     if (cookie_text instanceof Array) cookie_text = cookie_text.join(",");
     var cookies = cookie_text.replace(/(^|;|,)\s*(expires)=(\w*),([^=]*)(;|$)/ig, "$1$2=$3.$4$5")
@@ -57,6 +58,7 @@ function addCookie(cookie_text, originDomain = "") {
 }
 
 function getCookies(domainPath) {
+    domainPath = getDomainPath(domainPath);
     var cookieObject = {};
     var splited = domainPath.split("/");
     var domain = splited[0];
@@ -87,10 +89,16 @@ function getCookies(domainPath) {
 }
 
 function delCookies(domainPath) {
+    domainPath = getDomainPath(domainPath);
     var splited = domainPath.split("/");
     var domain = splited[0];
     delete cookiesMap[domain];
 }
+function getDomainPath(url) {
+    var { host, pathname } = parseURL(url);
+    if (pathname) return host + pathname;
+    return host;
+}
 
 return {
     cookiesMap,

package/coms/basic/cross_.js

@@ -322,6 +322,9 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         xhr.nocookie = true;
         return xhr;
     };
+    xhr.getCookies = function () {
+        return getCookies(originDomain);
+    };
     requests.push(xhr);
     return xhr;
 }

package/coms/zimoli/drag.js

@@ -128,6 +128,7 @@ var bindActionTarget = function (action, actionTarget) {
 };
 
 drag.on = function (target, actionTarget = target.dragTarget) {
+    if (getTargetIn(target, actionTarget, false)) [target, actionTarget] = [actionTarget, target];
     if (!actionTarget) {
         if (target.dragHandle) {
             actionTarget = target;

package/coms/zimoli/field.html

@@ -4,7 +4,7 @@
         <span class="required" ng-if="field.required">*</span>
     </div>
     <div class="body">
-        <model _data=data _field=field></model>
+        <model _data=data _field=field _readonly="readonly"></model>
         <span class="error" ng-bind="error"></span>
     </div>
     <div class="foot" ng-if="field.msg">
@@ -12,5 +12,5 @@
     </div>
 </template>
 <template v-else>
-    <model _data=data _field=field></model>
+    <model _data=data _field=field _readonly="readonly"></model>
 </template>

package/coms/zimoli/field.js

@@ -9,7 +9,8 @@ function main(elem) {
             model,
             data,
             error: null,
-            field: f
+            field: f,
+            readonly: !!this.readonly
         });
         elem.oldValue = data[f.key];
         elem.setAttribute("field", f.key);

package/package.json

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