clickgo 3.6.0 → 3.6.1

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.1'}"></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.1';
 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.1';
 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;
         }

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;
         }

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.1",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",