efront 4.0.33 → 4.0.35

package/coms/compile/Javascript.js

@@ -58,7 +58,7 @@ Javascript.prototype.isProperty = function (o) {
             return /^(\+\+|\-\-|;)$/.test(prev.text);
         }
         if (prev.type === EXPRESS && !/\.$/.test(prev.text)) return true;
-        if (~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type)) return true;
+        if (prev.type & (SCOPED | VALUE | QUOTED | PROPERTY)) return true;
     }
     if (!prev) return false;
     if (prev.type === PROPERTY && propresolve_reg.test(prev.text)) {
@@ -207,7 +207,7 @@ var isShortMethodEnd = function (o) {
     if (o.type !== SCOPED || o.entry !== "(") return false;
     o = o.prev;
     if (!o) return false;
-    return o.type === PROPERTY;
+    return o.isprop;
 };
 
 Javascript.prototype.setType = function (o) {
@@ -226,7 +226,7 @@ Javascript.prototype.setType = function (o) {
         else if (o.type === SCOPED) {
             if (o.entry === '[') {
                 if (queue.isObject) o.isprop = this.isProperty(o);
-                if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
+                if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';' || isShortMethodEnd(last);
             }
             else if (o.entry === "{") {
                 if (last && last.type === PROPERTY && last.text === 'static') {
@@ -506,8 +506,9 @@ var removeImport = function (c, i, code) {
         var [dec, map, o] = getDeclared(c.next);
         if (dec.length !== 1 || !o) throw new Error("代码结构异常！");
         if (o.type !== STRAP || o.text !== 'from') throw new Error("缺少from语句");
+        var oi = code.indexOf(o, i);
     }
-    else code.splice(i, 1), o = c;
+    else code.splice(i, 1), o = c, oi = i - 1;
     var n = o.next;
     var t = null;
     if (n && n.type === EXPRESS) {
@@ -522,7 +523,6 @@ var removeImport = function (c, i, code) {
         n = n.next;
     }
     if (!n || n.type !== QUOTED) throw new Error("缺少导入路径！");
-    var oi = code.indexOf(o, i);
     var ns = skipAssignment(n);
     var nsi = ns ? code.indexOf(ns, i) : code.length;
     var q = scan(`require()`);

package/coms/compile/Javascript_test.js

@@ -9,3 +9,5 @@ testFix(`import {a} from "a";console.log(a)`, 'var a1 = require("a"); console.lo
 testFix(`console.log(import("a"))`, 'console.log(require("a"))');
 testFix(`import("a")`, 'require("a")');
 testFix(`import "windows.inc"`, 'require("windows.inc")');
+testFix(`import "windows.inc";import "abc.inc";`, 'require("windows.inc"); require("abc.inc");');
+testFix(`import "windows.inc";\r\nimport "abc.inc";`, 'require("windows.inc");\r\nrequire("abc.inc");');

package/docs/main.xht

@@ -43,6 +43,7 @@
     }
 
     menu {
+        margin: 0;
         width: var(--leftwidth);
         margin-left: -var(--leftwidth);
         height: 100%;
@@ -51,6 +52,20 @@
         max-width: 600px;
     }
 
+    titlebar {
+        background: #2c2c2c;
+        -webkit-app-region: drag;
+
+        >.drop {
+            -webkit-app-region: no-drag;
+            vertical-align: top;
+            right: 20px;
+            box-sizing: border-box;
+            padding: 0 7px;
+            line-height: 44px;
+        }
+    }
+
     div1 {
         display: inline-block;
         width: 100%;
@@ -204,6 +219,20 @@
     };
     var page = document.createElement('grid');
     page.innerHTML = template;
+    if (window.require) {
+        var title = document.createElement('titlebar');
+        title.innerHTML = document.title;
+        css(page, { paddingTop: "44px" })
+        css(title, { height: '44px', lineHeight: '44px' });
+        page.insertBefore(title, page.firstChild);
+        var close = drop();
+        title.appendChild(close);
+        onclick(close, function () {
+            window.close();
+        })
+        titlebar(title, false);
+        drag.on(close, window);
+    }
     render(page, scope);
     var s = scrollbar();
     on("mounted")(page, initMenus);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.33",
+    "version": "4.0.35",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {