clickgo 3.2.3 → 3.2.4

package/README.md

@@ -28,7 +28,7 @@ Load the module loader first, and then load it using the module loader.
 **index.html**
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.9/dist/loader.min.js?path=index&npm={'clickgo':'3.2.3'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.9/dist/loader.min.js?path=index&npm={'clickgo':'3.2.4'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/form/method/dom/dom.js

@@ -121,9 +121,9 @@ class default_1 extends clickgo.form.AbstractForm {
     bindGesture(e) {
         clickgo.dom.bindGesture(e, (ne, dir) => {
             if (['top', 'bottom'].includes(dir)) {
-                return true;
+                return 1;
             }
-            return false;
+            return 0;
         }, (dir) => __awaiter(this, void 0, void 0, function* () {
             this.bindGestureText = dir.slice(0, 1).toUpperCase() + dir.slice(1);
             yield clickgo.tool.sleep(500);
@@ -133,9 +133,9 @@ class default_1 extends clickgo.form.AbstractForm {
     bindGestureWheel(e) {
         clickgo.dom.bindGesture(e, (ne, dir) => {
             if (['top', 'bottom', 'left', 'right'].includes(dir)) {
-                return true;
+                return 1;
             }
-            return false;
+            return 0;
         }, (dir) => __awaiter(this, void 0, void 0, function* () {
             this.bindGestureWheelText = dir.slice(0, 1).toUpperCase() + dir.slice(1);
             yield clickgo.tool.sleep(500);

package/dist/clickgo.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0;
-const version = '3.2.3';
+const version = '3.2.4';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.2.3';
+const version = '3.2.4';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/dom.js

@@ -878,7 +878,14 @@ function bindGesture(oe, before, handler) {
             move: (e, d) => {
                 if (first < 0) {
                     if (first > -30) {
-                        before(e, dir);
+                        const rtn = before(e, dir);
+                        if (rtn === 1) {
+                            e.stopPropagation();
+                            e.preventDefault();
+                        }
+                        else if (rtn === -1) {
+                            e.stopPropagation();
+                        }
                         --first;
                     }
                     return;
@@ -902,7 +909,15 @@ function bindGesture(oe, before, handler) {
                             dir = 'left';
                         }
                     }
-                    if (!before(e, dir)) {
+                    const rtn = before(e, dir);
+                    if (rtn === 1) {
+                        e.stopPropagation();
+                        e.preventDefault();
+                    }
+                    else {
+                        if (rtn === -1) {
+                            e.stopPropagation();
+                        }
                         first = -1;
                         return;
                     }
@@ -1028,8 +1043,19 @@ function bindGesture(oe, before, handler) {
                         gestureWheel.dir = 'right';
                     }
                 }
-                if (!before(oe, gestureWheel.dir)) {
-                    gestureWheel.done = true;
+                const rtn = before(oe, gestureWheel.dir);
+                if (rtn === 1) {
+                    oe.stopPropagation();
+                    oe.preventDefault();
+                }
+                else {
+                    if (rtn === -1) {
+                        oe.stopPropagation();
+                        gestureWheel.done = true;
+                    }
+                    else {
+                        gestureWheel.dir = '';
+                    }
                     return;
                 }
                 form.elements.gesture.style.transform = 'scale(0)';

package/dist/lib/dom.ts

@@ -1150,10 +1150,10 @@ const gestureWheel = {
 /**
  * --- 绑定上拉、下拉、左拉、右拉 ---
  * @param oe 响应事件
- * @param before before 事件，返回 true 则显示 gesture
+ * @param before before 事件，返回 1 则显示 gesture，0 则不处理（可能会向上传递事件），-1 则 stopPropagation（本层可拖动，若实际不可拖动则可能导致浏览器页面滚动）
  * @param handler 执行完毕的话才会回调
  */
-export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e: MouseEvent | TouchEvent | WheelEvent, dir: 'top' | 'right' | 'bottom' | 'left') => boolean, handler?: (dir: 'top' | 'right' | 'bottom' | 'left') => void | Promise<void>): void {
+export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e: MouseEvent | TouchEvent | WheelEvent, dir: 'top' | 'right' | 'bottom' | 'left') => number, handler?: (dir: 'top' | 'right' | 'bottom' | 'left') => void | Promise<void>): void {
     const el = oe.currentTarget as HTMLElement | null;
     if (!el) {
         return;
@@ -1172,7 +1172,14 @@ export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e
             move: (e, d) => {
                 if (first < 0) {
                     if (first > -30) {
-                        before(e, dir);
+                        const rtn = before(e, dir);
+                        if (rtn === 1) {
+                            e.stopPropagation();
+                            e.preventDefault();
+                        }
+                        else if (rtn === -1) {
+                            e.stopPropagation();
+                        }
                         --first;
                     }
                     return;
@@ -1197,7 +1204,15 @@ export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e
                             dir = 'left';
                         }
                     }
-                    if (!before(e, dir)) {
+                    const rtn = before(e, dir);
+                    if (rtn === 1) {
+                        e.stopPropagation();
+                        e.preventDefault();
+                    }
+                    else {
+                        if (rtn === -1) {
+                            e.stopPropagation();
+                        }
                         first = -1;
                         return;
                     }
@@ -1342,10 +1357,22 @@ export function bindGesture(oe: MouseEvent | TouchEvent | WheelEvent, before: (e
                         gestureWheel.dir = 'right';
                     }
                 }
-                // --- 判断是否要显示滚动条 ---
-                if (!before(oe, gestureWheel.dir as any)) {
+                // --- 判断是否要显示 gesture ---
+                const rtn = before(oe, gestureWheel.dir as any);
+                if (rtn === 1) {
+                    oe.stopPropagation();
+                    oe.preventDefault();
+                }
+                else {
                     // --- 不显示 ---
-                    gestureWheel.done = true;
+                    // --- 还得判断是不是 stopPropagation 了，如果 stopPropagation 了，才 true ---
+                    if (rtn === -1) {
+                        oe.stopPropagation();
+                        gestureWheel.done = true;
+                    }
+                    else {
+                        gestureWheel.dir = '';
+                    }
                     return;
                 }
                 // --- 重置位置 ---

package/dist/lib/task.ts

@@ -562,7 +562,7 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             bindDown: function(oe: MouseEvent | TouchEvent, opt: types.IBindDownOptions) {
                 dom.bindDown(oe, opt);
             },
-            bindGesture: function(oe: MouseEvent | TouchEvent | WheelEvent, before: (e: MouseEvent | TouchEvent | WheelEvent, dir: 'top' | 'right' | 'bottom' | 'left') => boolean, handler: (dir: 'top' | 'right' | 'bottom' | 'left') => void): void {
+            bindGesture: function(oe: MouseEvent | TouchEvent | WheelEvent, before: (e: MouseEvent | TouchEvent | WheelEvent, dir: 'top' | 'right' | 'bottom' | 'left') => number, handler: (dir: 'top' | 'right' | 'bottom' | 'left') => void): void {
                 dom.bindGesture(oe, before, handler);
             },
             bindLong: function(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",