clickgo 3.15.12 → 3.15.13

package/dist/lib/core.js

@@ -33,7 +33,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.open = exports.back = exports.getLocation = exports.location = exports.getHost = exports.getHash = exports.hash = exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.global = exports.config = void 0;
+exports.boot = exports.AbstractApp = exports.global = exports.config = void 0;
+exports.getCdn = getCdn;
+exports.regModule = regModule;
+exports.getModule = getModule;
+exports.trigger = trigger;
+exports.readApp = readApp;
+exports.fetchApp = fetchApp;
+exports.getAvailArea = getAvailArea;
+exports.hash = hash;
+exports.getHash = getHash;
+exports.getHost = getHost;
+exports.location = location;
+exports.getLocation = getLocation;
+exports.back = back;
+exports.open = open;
 const clickgo = __importStar(require("../clickgo"));
 const fs = __importStar(require("./fs"));
 const form = __importStar(require("./form"));
@@ -140,7 +154,6 @@ exports.AbstractApp = AbstractApp;
 function getCdn() {
     return loader.cdn;
 }
-exports.getCdn = getCdn;
 clickgo.vue.watch(exports.config, function () {
     for (const key in configOrigin) {
         if (exports.config[key] !== undefined) {
@@ -308,7 +321,6 @@ function regModule(name, func) {
     };
     return true;
 }
-exports.regModule = regModule;
 function getModule(name) {
     return new Promise((resolve) => {
         if (!modules[name]) {
@@ -350,7 +362,6 @@ function getModule(name) {
         return;
     });
 }
-exports.getModule = getModule;
 const globalEvents = {
     screenResize: function () {
         form.refreshMaxPosition();
@@ -563,7 +574,6 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '', param3
         }
     }
 }
-exports.trigger = trigger;
 function readApp(blob) {
     return __awaiter(this, void 0, void 0, function* () {
         const head = yield tool.blob2Text(blob.slice(0, 5));
@@ -618,7 +628,6 @@ function readApp(blob) {
         };
     });
 }
-exports.readApp = readApp;
 function fetchApp(url_1) {
     return __awaiter(this, arguments, void 0, function* (url, opt = {}, taskId) {
         let cga = '';
@@ -755,7 +764,6 @@ function fetchApp(url_1) {
         };
     });
 }
-exports.fetchApp = fetchApp;
 function getAvailArea() {
     if (Object.keys(form.simpleSystemTaskRoot.forms).length > 0) {
         return {
@@ -811,7 +819,6 @@ function getAvailArea() {
         };
     }
 }
-exports.getAvailArea = getAvailArea;
 function hash(hash, taskId) {
     if (!taskId) {
         return false;
@@ -826,11 +833,9 @@ function hash(hash, taskId) {
     window.location.hash = hash;
     return true;
 }
-exports.hash = hash;
 function getHash() {
     return window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '';
 }
-exports.getHash = getHash;
 function getHost() {
     const match = /https?:\/\/([-a-zA-Z0-9:.]+)/.exec(window.location.href);
     if (!match) {
@@ -838,7 +843,6 @@ function getHost() {
     }
     return match[1];
 }
-exports.getHost = getHost;
 function location(url, taskId) {
     if (!taskId) {
         return false;
@@ -853,11 +857,9 @@ function location(url, taskId) {
     window.location.href = url;
     return true;
 }
-exports.location = location;
 function getLocation() {
     return window.location.href;
 }
-exports.getLocation = getLocation;
 function back(taskId) {
     if (!taskId) {
         return false;
@@ -872,11 +874,9 @@ function back(taskId) {
     window.history.back();
     return true;
 }
-exports.back = back;
 function open(url) {
     window.open(url);
 }
-exports.open = open;
 window.addEventListener('hashchange', function () {
     trigger('hashChanged', window.location.hash ? decodeURIComponent(window.location.hash.slice(1)) : '');
 });

package/dist/lib/dom.js

@@ -65,6 +65,7 @@ exports.getWatchInfo = getWatchInfo;
 exports.bindClick = bindClick;
 exports.bindDblClick = bindDblClick;
 exports.bindDown = bindDown;
+exports.bindScale = bindScale;
 exports.bindGesture = bindGesture;
 exports.allowEvent = allowEvent;
 exports.bindLong = bindLong;
@@ -1064,6 +1065,89 @@ function bindDown(oe, opt) {
     }
     (_a = opt.down) === null || _a === void 0 ? void 0 : _a.call(opt, oe);
 }
+function bindScale(oe, handler) {
+    var _a, _b, _c, _d;
+    const el = oe.currentTarget;
+    if (!el) {
+        return;
+    }
+    if (oe instanceof TouchEvent) {
+        if (oe.type === 'touchend') {
+            if (oe.touches.length) {
+                return;
+            }
+            el.removeAttribute('data-cg-scale');
+            return;
+        }
+        const ex = [oe.touches[0].clientX, (_b = (_a = oe.touches[1]) === null || _a === void 0 ? void 0 : _a.clientX) !== null && _b !== void 0 ? _b : -1000];
+        const ey = [oe.touches[0].clientY, (_d = (_c = oe.touches[1]) === null || _c === void 0 ? void 0 : _c.clientY) !== null && _d !== void 0 ? _d : -1000];
+        let ndis = 0;
+        const epos = {
+            'x': ex[0],
+            'y': ey[0]
+        };
+        if (ex[1] !== -1000) {
+            const nx = ex[0] - ex[1];
+            const ny = ey[0] - ey[1];
+            ndis = Math.hypot(nx, ny);
+            const cnx = (ex[0] + ex[1]) / 2;
+            const cny = (ey[0] + ey[1]) / 2;
+            epos['x'] = cnx;
+            epos['y'] = cny;
+        }
+        if (el.dataset.cgScale === undefined) {
+            el.dataset.cgScale = JSON.stringify({
+                'dis': ndis,
+                'x': ex,
+                'y': ey,
+                'pos': epos
+            });
+            return;
+        }
+        const d = JSON.parse(el.dataset.cgScale);
+        let notchange = false;
+        if (ex[1] !== -1000) {
+            if (d.x[1] === -1000) {
+                notchange = true;
+            }
+        }
+        else {
+            if (d.x[1] !== -1000) {
+                notchange = true;
+            }
+        }
+        const scale = ndis > 0 && d.dis > 0 ? ndis / d.dis : 1;
+        handler(oe, scale, {
+            'x': notchange ? 0 : epos['x'] - d.pos['x'],
+            'y': notchange ? 0 : epos['y'] - d.pos['y']
+        });
+        el.dataset.cgScale = JSON.stringify({
+            'dis': ndis,
+            'x': ex,
+            'y': ey,
+            'pos': epos
+        });
+        return;
+    }
+    if (oe instanceof WheelEvent) {
+        if (!oe.deltaY) {
+            return;
+        }
+        handler(oe, oe.deltaY * (oe.deltaY > 0 ? 0.012 : -0.008), {
+            'x': 0,
+            'y': 0
+        });
+        return;
+    }
+    bindMove(oe, {
+        'move': (e, opt) => {
+            handler(oe, 1, {
+                'x': opt.ox,
+                'y': opt.oy
+            });
+        }
+    });
+}
 const gestureWheel = {
     'last': 0,
     'offset': 0,

package/dist/lib/dom.ts

@@ -1397,6 +1397,111 @@ export function bindDown<T extends MouseEvent | TouchEvent>(oe: T, opt: types.IB
     opt.down?.(oe);
 }
 
+/**
+ * --- 绑定缩放，要绑定到 mousedown、touchstart、touchmove、touchend、wheel 上 ---
+ * @param oe 触发的时间
+ * @param handler 回调函数
+ */
+export function bindScale(oe: MouseEvent | TouchEvent | WheelEvent, handler: (e: MouseEvent | TouchEvent | WheelEvent, scale: number, cpos: { 'x': number; 'y': number; }) => void | Promise<void>): void {
+    const el = oe.currentTarget as HTMLElement;
+    if (!el) {
+        return;
+    }
+    if (oe instanceof TouchEvent) {
+        // --- 指头 ---
+        if (oe.type === 'touchend') {
+            if (oe.touches.length) {
+                return;
+            }
+            el.removeAttribute('data-cg-scale');
+            return;
+        }
+        /** --- 本次 x 坐标点 --- */
+        const ex = [oe.touches[0].clientX, oe.touches[1]?.clientX ?? -1000];
+        /** --- 本次 y 坐标点 --- */
+        const ey = [oe.touches[0].clientY, oe.touches[1]?.clientY ?? -1000];
+        /** --- 当前两指间的距离 --- */
+        let ndis = 0;
+        /** --- 当前中心点 --- */
+        const epos = {
+            'x': ex[0],
+            'y': ey[0]
+        };
+        if (ex[1] !== -1000) {
+            // --- 计算两指间距离 ---
+            const nx = ex[0] - ex[1];
+            const ny = ey[0] - ey[1];
+            ndis = Math.hypot(nx, ny);
+            // --- 计算中心点 ---
+            const cnx = (ex[0] + ex[1]) / 2;
+            const cny = (ey[0] + ey[1]) / 2;
+            epos['x'] = cnx;
+            epos['y'] = cny;
+        }
+        if (el.dataset.cgScale === undefined) {
+            // --- 首次 ---
+            el.dataset.cgScale = JSON.stringify({
+                /** --- 上次两指间距离 --- */
+                'dis': ndis,
+                /** --- 上次 x 坐标点 --- */
+                'x': ex,
+                /** --- 上次 y 坐标点 --- */
+                'y': ey,
+                /** --- 上次的中心点 --- */
+                'pos': epos
+            });
+            return;
+        }
+        const d = JSON.parse(el.dataset.cgScale);
+        // --- 看看是否计算偏移 ---
+        let notchange = false;
+        if (ex[1] !== -1000) {
+            if (d.x[1] === -1000) {
+                notchange = true;
+            }
+        }
+        else {
+            if (d.x[1] !== -1000) {
+                notchange = true;
+            }
+        }
+        // --- 计算缩放偏移 ---
+        const scale = ndis > 0 && d.dis > 0 ? ndis / d.dis : 1;
+        handler(oe, scale, {
+            'x': notchange ? 0 : epos['x'] - d.pos['x'],
+            'y': notchange ? 0 : epos['y'] - d.pos['y']
+        }) as any;
+        // --- 覆盖 ---
+        el.dataset.cgScale = JSON.stringify({
+            'dis': ndis,
+            'x': ex,
+            'y': ey,
+            'pos': epos
+        });
+        return;
+    }
+    if (oe instanceof WheelEvent) {
+        // --- 滚轮 ---
+        if (!oe.deltaY) {
+            return;
+        }
+        handler(oe, oe.deltaY * (oe.deltaY > 0 ? 0.012 : -0.008), {
+            'x': 0,
+            'y': 0
+        }) as any;
+        return;
+    }
+    // --- 纯鼠标拖动 ---
+    bindMove(oe, {
+        'move': (e, opt) => {
+            handler(oe, 1, {
+                'x': opt.ox,
+                'y': opt.oy
+            }) as any;
+        }
+    });
+}
+
 /** --- 绑定拖拉响应操作的 wheel 数据对象 --- */
 const gestureWheel = {
     /** --- 最后一次响应事件时间 --- */