clickgo 3.6.0 → 3.6.2

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.5.0/dist/loader.min.js?path=index&npm={'clickgo':'3.6.0'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.5.0/dist/loader.min.js?path=index&npm={'clickgo':'3.6.2'}"></script>
 ```
 
 **index.js**

package/dist/app/demo/form/control/link/link.xml

@@ -1,7 +1,8 @@
-<form width="300" height="300" title="Link">
+<form width="300" height="350" title="Link">
     <layout direction="v" gutter="10" style="padding: 10px; flex: 1; width: 0;">
         <label>You can use CSS to customize the link:</label>
         <link>Normal</link>
+        <link plain>Plain</link>
         <link style="text-align: center;">Center</link>
         <link style="color: red;">Color</link>
         <link style="background: rgba(0, 0, 0, .1);">Background</link>

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.6.0';
+const version = '3.6.2';
 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.6.0';
+const version = '3.6.2';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/form.js

@@ -824,6 +824,9 @@ function get(formId) {
     if (taskId === 0) {
         return null;
     }
+    if (!task.list[taskId].forms[formId]) {
+        return null;
+    }
     const item = task.list[taskId].forms[formId];
     return {
         'taskId': taskId,
@@ -1005,13 +1008,16 @@ function getMaxZIndexID(out = {}) {
             continue;
         }
         const z = parseInt(formInner.style.zIndex);
-        if (z > 9999999) {
+        if (z < 1000000) {
             continue;
         }
         if (formInner.dataset.cgMin !== undefined) {
             continue;
         }
         const tid = parseInt(formWrap.getAttribute('data-task-id'));
+        if (tid === task.systemTaskInfo.taskId) {
+            continue;
+        }
         if ((_a = out.taskIds) === null || _a === void 0 ? void 0 : _a.includes(tid)) {
             continue;
         }
@@ -1311,50 +1317,10 @@ function removeFromPop(el) {
     exports.elements.popList.removeChild(el);
 }
 exports.removeFromPop = removeFromPop;
-let lastShowPopTime = 0;
-function showPop(el, pop, direction, opt = {}) {
+function refreshPopPosition(el, pop, direction, size = {}) {
     var _a, _b;
-    if (opt.null === undefined) {
-        opt.null = false;
-    }
-    if (opt.size === undefined) {
-        opt.size = {};
-    }
-    if (!pop && !opt.null) {
-        return;
-    }
-    const now = Date.now();
-    if (now - lastShowPopTime < 5) {
-        lastShowPopTime = now;
-        return;
-    }
-    lastShowPopTime = now;
-    if (el.dataset.cgPopOpen !== undefined) {
-        return;
-    }
-    const parentPop = dom.findParentByData(el, 'cg-pop');
-    if (parentPop) {
-        for (let i = 0; i < popInfo.list.length; ++i) {
-            if (popInfo.list[i] !== parentPop) {
-                continue;
-            }
-            if (!popInfo.elList[i + 1]) {
-                continue;
-            }
-            hidePop(popInfo.elList[i + 1]);
-        }
-    }
-    else {
-        hidePop();
-    }
-    if (!pop) {
-        popInfo.elList.push(el);
-        el.dataset.cgPopOpen = '';
-        el.dataset.cgLevel = (popInfo.elList.length - 1).toString();
-        return;
-    }
-    const width = (_a = opt.size.width) !== null && _a !== void 0 ? _a : (pop ? pop.offsetWidth : 0);
-    const height = (_b = opt.size.height) !== null && _b !== void 0 ? _b : (pop ? pop.offsetHeight : 0);
+    const width = (_a = size.width) !== null && _a !== void 0 ? _a : pop.offsetWidth;
+    const height = (_b = size.height) !== null && _b !== void 0 ? _b : pop.offsetHeight;
     let left, top;
     if (typeof direction === 'string') {
         const bcr = el.getBoundingClientRect();
@@ -1416,11 +1382,59 @@ function showPop(el, pop, direction, opt = {}) {
     pop.style.left = left.toString() + 'px';
     pop.style.top = top.toString() + 'px';
     pop.style.zIndex = (++popInfo.lastZIndex).toString();
-    if (opt.size.width) {
-        pop.style.width = opt.size.width.toString() + 'px';
+    if (size.width) {
+        pop.style.width = size.width.toString() + 'px';
+    }
+    if (size.height) {
+        pop.style.height = size.height.toString() + 'px';
+    }
+}
+let lastShowPopTime = 0;
+function showPop(el, pop, direction, opt = {}) {
+    if (opt.null === undefined) {
+        opt.null = false;
+    }
+    if (opt.size === undefined) {
+        opt.size = {};
+    }
+    if (!pop && !opt.null) {
+        return;
+    }
+    const now = Date.now();
+    if (now - lastShowPopTime < 5) {
+        lastShowPopTime = now;
+        return;
+    }
+    lastShowPopTime = now;
+    if (el.dataset.cgPopOpen !== undefined) {
+        return;
     }
-    if (opt.size.height) {
-        pop.style.height = opt.size.height.toString() + 'px';
+    const parentPop = dom.findParentByData(el, 'cg-pop');
+    if (parentPop) {
+        for (let i = 0; i < popInfo.list.length; ++i) {
+            if (popInfo.list[i] !== parentPop) {
+                continue;
+            }
+            if (!popInfo.elList[i + 1]) {
+                continue;
+            }
+            hidePop(popInfo.elList[i + 1]);
+        }
+    }
+    else {
+        hidePop();
+    }
+    if (!pop) {
+        popInfo.elList.push(el);
+        el.dataset.cgPopOpen = '';
+        el.dataset.cgLevel = (popInfo.elList.length - 1).toString();
+        return;
+    }
+    refreshPopPosition(el, pop, direction, opt.size);
+    if (opt.autoPosition && typeof direction === 'string' && ['h', 'v'].includes(direction)) {
+        clickgo.dom.watchSize(pop, () => {
+            refreshPopPosition(el, pop, direction, opt.size);
+        });
     }
     popInfo.list.push(pop);
     popInfo.elList.push(el);
@@ -1457,6 +1471,7 @@ function hidePop(pop) {
     if (isPop) {
         pop.removeAttribute('data-cg-open');
         pop.removeAttribute('data-cg-level');
+        clickgo.dom.unwatchSize(pop);
         popInfo.elList[level].removeAttribute('data-cg-pop-open');
         popInfo.elList[level].removeAttribute('data-cg-level');
     }
@@ -1464,6 +1479,7 @@ function hidePop(pop) {
         if (popInfo.list[level]) {
             popInfo.list[level].removeAttribute('data-cg-open');
             popInfo.list[level].removeAttribute('data-cg-level');
+            clickgo.dom.unwatchSize(popInfo.list[level]);
         }
         pop.removeAttribute('data-cg-pop-open');
         pop.removeAttribute('data-cg-level');

package/dist/lib/form.ts

@@ -1134,6 +1134,9 @@ export function get(formId: number): types.IFormInfo | null {
     if (taskId === 0) {
         return null;
     }
+    if (!task.list[taskId].forms[formId]) {
+        return null;
+    }
     const item = task.list[taskId].forms[formId];
     return {
         'taskId': taskId,
@@ -1367,9 +1370,9 @@ export function getMaxZIndexID(out: {
         if (!formInner) {
             continue;
         }
-        // --- 排除 top most 窗体 ---
+        // --- 排除 bottom most 窗体 ---
         const z = parseInt(formInner.style.zIndex);
-        if (z > 9999999) {
+        if (z < 1000000) {
             continue;
         }
         // --- 排除最小化窗体 ---
@@ -1378,6 +1381,10 @@ export function getMaxZIndexID(out: {
         }
         // --- 排除用户定义的 task id 窗体 ---
         const tid = parseInt(formWrap.getAttribute('data-task-id')!);
+        if (tid === task.systemTaskInfo.taskId) {
+            // --- 系统任务排除掉 ---
+            continue;
+        }
         if (out.taskIds?.includes(tid)) {
             continue;
         }
@@ -1737,65 +1744,11 @@ export function removeFromPop(el: HTMLElement): void {
     elements.popList.removeChild(el);
 }
 
-/** --- 最后一次 touchstart 的时间戳 */
-let lastShowPopTime: number = 0;
-/**
- * --- 获取 pop 显示出来的坐标并报系统全局记录 ---
- * @param el 响应的元素
- * @param pop 要显示 pop 元素
- * @param direction 要显示方向（以 $el 为准的 h 水平和 v 垂直）或坐标
- * @param opt width / height 显示的 pop 定义自定义宽/高度，可省略；null，true 代表为空也会显示，默认为 false
- */
-export function showPop(el: HTMLElement, pop: HTMLElement | undefined, direction: 'h' | 'v' | MouseEvent | TouchEvent | { x: number; y: number; }, opt: { 'size'?: { width?: number; height?: number; }; 'null'?: boolean; } = {}): void {
-    // --- opt.null 为 true 代表可为空，为空也会被显示，默认为 false ---
-    if (opt.null === undefined) {
-        opt.null = false;
-    }
-    if (opt.size === undefined) {
-        opt.size = {};
-    }
-    // --- 也可能不执行本次显示 ---
-    if (!pop && !opt.null) {
-        return;
-    }
-    // --- 如果短时间内已经有了 pop 被展示，则可能是冒泡序列，本次则不展示 ---
-    const now = Date.now();
-    if (now - lastShowPopTime < 5) {
-        lastShowPopTime = now;
-        return;
-    }
-    lastShowPopTime = now;
-    // --- 检测是不是已经显示了 ---
-    if (el.dataset.cgPopOpen !== undefined) {
-        return;
-    }
-    /** --- 要不要隐藏别的 pop --- */
-    const parentPop = dom.findParentByData(el, 'cg-pop');
-    if (parentPop) {
-        for (let i = 0; i < popInfo.list.length; ++i) {
-            if (popInfo.list[i] !== parentPop) {
-                continue;
-            }
-            if (!popInfo.elList[i + 1]) {
-                continue;
-            }
-            hidePop(popInfo.elList[i + 1]);
-        }
-    }
-    else {
-        // --- 本层不是 pop，因此要隐藏所有 pop ---
-        hidePop();
-    }
-    // --- 检测如果 pop 是 undefined 还显示吗 ---
-    if (!pop) {
-        popInfo.elList.push(el);
-        el.dataset.cgPopOpen = '';
-        el.dataset.cgLevel = (popInfo.elList.length - 1).toString();
-        return;
-    }
+/** --- 重新调整 pop 的位置 --- */
+function refreshPopPosition(el: HTMLElement, pop: HTMLElement, direction: 'h' | 'v' | MouseEvent | TouchEvent | { x: number; y: number; }, size: { width?: number; height?: number; } = {}): void {
     // --- 最终 pop 的大小 ---
-    const width = opt.size.width ?? (pop ? pop.offsetWidth : 0);
-    const height = opt.size.height ?? (pop ? pop.offsetHeight : 0);
+    const width = size.width ?? pop.offsetWidth;
+    const height = size.height ?? pop.offsetHeight;
     // --- 最终显示位置 ---
     let left: number, top: number;
     if (typeof direction === 'string') {
@@ -1866,11 +1819,77 @@ export function showPop(el: HTMLElement, pop: HTMLElement | undefined, direction
     pop.style.left = left.toString() + 'px';
     pop.style.top = top.toString() + 'px';
     pop.style.zIndex = (++popInfo.lastZIndex).toString();
-    if (opt.size.width) {
-        pop.style.width = opt.size.width.toString() + 'px';
+    if (size.width) {
+        pop.style.width = size.width.toString() + 'px';
     }
-    if (opt.size.height) {
-        pop.style.height = opt.size.height.toString() + 'px';
+    if (size.height) {
+        pop.style.height = size.height.toString() + 'px';
+    }
+}
+
+/** --- 最后一次 touchstart 的时间戳 */
+let lastShowPopTime: number = 0;
+/**
+ * --- 获取 pop 显示出来的坐标并报系统全局记录 ---
+ * @param el 响应的元素
+ * @param pop 要显示 pop 元素
+ * @param direction 要显示方向（以 $el 为准的 h 水平和 v 垂直）或坐标
+ * @param opt width / height 显示的 pop 定义自定义宽/高度，可省略；null，true 代表为空也会显示，默认为 false; autoPosition, 自动更新 pop 位置，默认 false，true 为原元素位置变更，pop 位置也会变更，pop 大小变更，位置也会变更
+ */
+export function showPop(el: HTMLElement, pop: HTMLElement | undefined, direction: 'h' | 'v' | MouseEvent | TouchEvent | { x: number; y: number; }, opt: { 'size'?: { width?: number; height?: number; }; 'null'?: boolean; 'autoPosition'?: boolean; } = {}): void {
+    // --- opt.null 为 true 代表可为空，为空也会被显示，默认为 false ---
+    if (opt.null === undefined) {
+        opt.null = false;
+    }
+    if (opt.size === undefined) {
+        opt.size = {};
+    }
+    // --- 也可能不执行本次显示 ---
+    if (!pop && !opt.null) {
+        return;
+    }
+    // --- 如果短时间内已经有了 pop 被展示，则可能是冒泡序列，本次则不展示 ---
+    const now = Date.now();
+    if (now - lastShowPopTime < 5) {
+        lastShowPopTime = now;
+        return;
+    }
+    lastShowPopTime = now;
+    // --- 检测是不是已经显示了 ---
+    if (el.dataset.cgPopOpen !== undefined) {
+        return;
+    }
+    /** --- 要不要隐藏别的 pop --- */
+    const parentPop = dom.findParentByData(el, 'cg-pop');
+    if (parentPop) {
+        for (let i = 0; i < popInfo.list.length; ++i) {
+            if (popInfo.list[i] !== parentPop) {
+                continue;
+            }
+            if (!popInfo.elList[i + 1]) {
+                continue;
+            }
+            hidePop(popInfo.elList[i + 1]);
+        }
+    }
+    else {
+        // --- 本层不是 pop，因此要隐藏所有 pop ---
+        hidePop();
+    }
+    // --- 检测如果 pop 是 undefined 还显示吗 ---
+    if (!pop) {
+        popInfo.elList.push(el);
+        el.dataset.cgPopOpen = '';
+        el.dataset.cgLevel = (popInfo.elList.length - 1).toString();
+        return;
+    }
+    // --- 设定 pop 位置 ---
+    refreshPopPosition(el, pop, direction, opt.size);
+    if (opt.autoPosition && typeof direction === 'string' && ['h', 'v'].includes(direction)) {
+        // --- 可能要重置 pop 位置 ---
+        clickgo.dom.watchSize(pop, () => {
+            refreshPopPosition(el, pop, direction, opt.size);
+        });
     }
     popInfo.list.push(pop);
     popInfo.elList.push(el);
@@ -1912,6 +1931,7 @@ export function hidePop(pop?: HTMLElement): void {
     if (isPop) {
         pop.removeAttribute('data-cg-open');
         pop.removeAttribute('data-cg-level');
+        clickgo.dom.unwatchSize(pop);
         popInfo.elList[level].removeAttribute('data-cg-pop-open');
         popInfo.elList[level].removeAttribute('data-cg-level');
     }
@@ -1919,6 +1939,7 @@ export function hidePop(pop?: HTMLElement): void {
         if (popInfo.list[level]) {
             popInfo.list[level].removeAttribute('data-cg-open');
             popInfo.list[level].removeAttribute('data-cg-level');
+            clickgo.dom.unwatchSize(popInfo.list[level]);
         }
         pop.removeAttribute('data-cg-pop-open');
         pop.removeAttribute('data-cg-level');

package/dist/lib/task.ts

@@ -732,7 +732,7 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             hideNotify: function(notifyId: number): void {
                 form.hideNotify(notifyId);
             },
-            showPop: function(el: HTMLElement, pop: HTMLElement | undefined, direction: 'h' | 'v' | MouseEvent | TouchEvent | { x: number; y: number; }, opt: { 'size'?: { width?: number; height?: number; }; 'null'?: boolean; } = {}): void {
+            showPop: function(el: HTMLElement, pop: HTMLElement | undefined, direction: 'h' | 'v' | MouseEvent | TouchEvent | { x: number; y: number; }, opt: { 'size'?: { width?: number; height?: number; }; 'null'?: boolean; 'autoPosition'?: boolean; } = {}): void {
                 form.showPop(el, pop, direction, opt);
             },
             hidePop: function(pop?: HTMLElement): void {

package/dist/lib/tool.js

@@ -429,12 +429,10 @@ function getBoolean(param) {
     if (t === 'boolean') {
         return param;
     }
-    else if (t === 'string') {
+    if (t === 'string') {
         return param === 'false' ? false : true;
     }
-    else {
-        return param ? true : false;
-    }
+    return param ? true : false;
 }
 exports.getBoolean = getBoolean;
 function getNumber(param) {

package/dist/lib/tool.ts

@@ -565,12 +565,10 @@ export function getBoolean(param: boolean | string | number | undefined): boolea
     if (t === 'boolean') {
         return param as boolean;
     }
-    else if (t === 'string') {
+    if (t === 'string') {
         return param === 'false' ? false : true;
     }
-    else {
-        return param ? true : false;
-    }
+    return param ? true : false;
 }
 
 /**

package/package.json

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