clickgo 3.1.14 → 3.1.16-dev2

package/dist/app/demo/config.json

@@ -11,7 +11,9 @@
         "/clickgo/control/monaco",
         "/clickgo/control/property",
         "/clickgo/control/table",
-        "/clickgo/control/nav"
+        "/clickgo/control/nav",
+        "/clickgo/control/desc",
+        "/clickgo/control/html"
     ],
     "style": "/package/global",
 
@@ -25,6 +27,8 @@
         "/form/control/button/button.xml",
         "/form/control/check/check.js",
         "/form/control/check/check.xml",
+        "/form/control/desc/desc.js",
+        "/form/control/desc/desc.xml",
         "/form/control/dialog/dialog.js",
         "/form/control/dialog/dialog.xml",
         "/form/control/file/file.js",
@@ -35,6 +39,8 @@
         "/form/control/form/form.css",
         "/form/control/form/form.js",
         "/form/control/form/form.xml",
+        "/form/control/html/html.js",
+        "/form/control/html/html.xml",
         "/form/control/img/img.xml",
         "/form/control/label/label.xml",
         "/form/control/layout/layout.xml",

package/dist/app/demo/form/control/button/button.css

@@ -1 +1 @@
-.buttons button{flex:3;height:30px}.buttons select{flex:1;height:30px}.tbuttons{padding:5px;background-color:rgba(255,255,255,.5)}.tbuttons button{width:24px;height:24px;margin-right:2px}img{width:16px;height:16px}
+.buttons button{flex:3;height:30px}.buttons select{flex:1;height:30px}.tbuttons{padding:5px;background-color:rgba(255,255,255,.1)}.tbuttons button{width:24px;height:24px;margin-right:2px}img{width:16px;height:16px}

package/dist/app/demo/form/control/button/button.scss

@@ -7,7 +7,7 @@
     }
 }
 .tbuttons {
-    padding: 5px; background-color: rgba(255, 255, 255, .5);
+    padding: 5px; background-color: rgba(255, 255, 255, .1);
     button {
         width: 24px; height: 24px; margin-right: 2px;
     }

package/dist/app/demo/form/control/desc/desc.js

@@ -0,0 +1,34 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const clickgo = __importStar(require("clickgo"));
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.border = true;
+        this.collapse = true;
+    }
+}
+exports.default = default_1;

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

@@ -0,0 +1,26 @@
+<form title="Desc" width="300" height="300" padding="10">
+    <layout gutter="10" direction="v" style="flex: 1;">
+        <desc :border="border" :collapse="collapse">
+            <desc-row>
+                <desc-head>HEAD1</desc-head>
+                <desc-head>HEAD2</desc-head>
+                <desc-head>HEAD3</desc-head>
+                <desc-head>HEAD4</desc-head>
+            </desc-row>
+            <desc-row>
+                <desc-head>HEAD5</desc-head>
+                <desc-cell>CELL1</desc-cell>
+                <desc-head>HEAD6</desc-head>
+                <desc-cell>CELL2</desc-cell>
+            </desc-row>
+            <desc-row>
+                <desc-head>HEAD7</desc-head>
+                <desc-cell colspan="3">CELL1</desc-cell>
+            </desc-row>
+        </desc>
+        <layout gutter="10">
+            <button @click="border = !border" style="flex: 1; padding: 10px 0;">border: {{border ? 'true' : 'false'}}</button>
+            <button @click="collapse = !collapse" style="flex: 1; padding: 10px 0;">collapse: {{collapse ? 'true' : 'false'}}</button>
+        </layout>
+    </layout>
+</form>

package/dist/app/demo/form/control/html/html.js

@@ -0,0 +1,52 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const clickgo = __importStar(require("clickgo"));
+class default_1 extends clickgo.form.AbstractForm {
+    constructor() {
+        super(...arguments);
+        this.html = `<h1>Hello world!</h1>
+<button>Button</button>
+<h2>H2 title</h2>
+<div>div</div>
+<h3>H3 title</h3>
+<input onclick="alert('alert')">
+<ul>
+    <li class="test">li</li>
+    <li>li</li>
+</ul>
+<span>span</span>
+<ol>
+    <li>li</li>
+    <li id="li">li</li>
+</ol>
+<script>alert('b');</script>
+<style>li{background:red;}div{background:blue;}#li{background:yellow;}</style>`;
+        this.css = `div{background:blue;}.test{background:red;}#li{background:yellow;}`;
+        this.lcss = '';
+        this.rcss = '';
+    }
+}
+exports.default = default_1;

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

@@ -0,0 +1,12 @@
+<form title="Html" width="400" height="500" padding="10">
+    <layout gutter="10" direction="v" style="flex: 1; width: 0;">
+        <layout gutter="10" style="flex: 1; height: 0;">
+            <html :html="html" :css="lcss" style="background: var(--g-plain-background); border: solid 1px var(--g-color); padding: 10px; flex: 1; width: 0;"></html>
+            <html :html="html" :css="rcss" style="background: var(--g-plain-background); border: solid 1px var(--g-color); padding: 10px; flex: 1; width: 0;"></html>
+        </layout>
+        <layout gutter="10">
+            <button style="height: 30px; flex: 1;" @click="lcss = lcss ? '' : css">Left {{lcss ? 'remove' : 'add'}} css</button>
+            <button style="height: 30px; flex: 1;" @click="rcss = rcss ? '' : css">Right {{rcss ? 'remove' : 'add'}} css</button>
+        </layout>
+    </layout>
+</form>

package/dist/app/demo/form/control/panel/test2.xml

@@ -1,4 +1,4 @@
-<panel direction="v" gutter="10" style="padding: 10px; border: solid 2px #000; border-color: #777 #DDD #DDD #777; background: #FFF;">
+<panel direction="v" gutter="10" style="padding: 10px; border: solid 2px #000; border-color: #777 #DDD #DDD #777; background: var(--g-plain-background);">
     <label>Hello, test2!</label>
     <label>Panel ID: {{panelId}}</label>
 </panel>

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

@@ -1,5 +1,5 @@
-<form title="Scroll" width="400" min-width="300" height="400" min-height="390" padding="10" background="#FFF">
-    <layout gutter="10" direction="v" style="flex: 1; width: 0;">
+<form title="Scroll" width="400" min-width="300" height="400" min-height="390" padding="10">
+    <layout gutter="10" direction="v" style="flex: 1; width: 0; background: var(--g-plain-background);">
         <layout gutter="10" style="flex: 1; height: 0;">
             <layout gutter="10" direction="v" style="flex: 1;">
                 <label>Offset: {{so1}}</label>
@@ -17,7 +17,7 @@
             <scroll :disabled="disabled" style="width: 30px;"></scroll>
         </layout>
         <scroll direction="h" :disabled="disabled" style="height: 30px;"></scroll>
-        <layout style="border: solid 1px rgba(0, 0, 0, .3); flex: 1; height: 0;">
+        <layout style="border: solid 1px var(--g-plain-border-color); flex: 1; height: 0;">
             <flow v-model:scroll-top="so2" direction="v" @clientheight="c2 = $event" @scrollheight="sh2 = $event" style="line-height: 1.5; flex: 1;">
                 <block style="padding: 10px;">
                     <block>Length: {{sh2}}, Client: {{c2}}.</block>

package/dist/app/demo/form/main.js

@@ -42,11 +42,13 @@ const check_1 = __importDefault(require("./control/check/check"));
 const dialog_1 = __importDefault(require("./control/dialog/dialog"));
 const file_1 = __importDefault(require("./control/file/file"));
 const form_1 = __importDefault(require("./control/form/form"));
+const html_1 = __importDefault(require("./control/html/html"));
 const layout_1 = __importDefault(require("./control/layout/layout"));
 const list_1 = __importDefault(require("./control/list/list"));
 const marquee_1 = __importDefault(require("./control/marquee/marquee"));
 const menu_1 = __importDefault(require("./control/menu/menu"));
 const monaco_1 = __importDefault(require("./control/monaco/monaco"));
+const desc_1 = __importDefault(require("./control/desc/desc"));
 const nav_1 = __importDefault(require("./control/nav/nav"));
 const panel_1 = __importDefault(require("./control/panel/panel"));
 const flow_1 = __importDefault(require("./control/flow/flow"));
@@ -101,6 +103,10 @@ class default_1 extends clickgo.form.AbstractForm {
                     frm = yield clickgo.form.create(check_1.default);
                     break;
                 }
+                case 'cdesc': {
+                    frm = yield clickgo.form.create(desc_1.default);
+                    break;
+                }
                 case 'cdialog': {
                     frm = yield clickgo.form.create(dialog_1.default);
                     break;
@@ -113,6 +119,10 @@ class default_1 extends clickgo.form.AbstractForm {
                     frm = yield clickgo.form.create(form_1.default);
                     break;
                 }
+                case 'chtml': {
+                    frm = yield clickgo.form.create(html_1.default);
+                    break;
+                }
                 case 'cvflow': {
                     frm = yield clickgo.form.create(vflow_1.default);
                     break;

package/dist/app/demo/form/main.xml

@@ -29,6 +29,8 @@
                 <button @click="openForm('cnav')">Nav</button>
                 <button @click="openForm('cbox')">Box</button>
                 <button @click="openForm('cmonaco')">Monaco</button>
+                <button @click="openForm('cdesc')">Desc</button>
+                <button @click="openForm('chtml')">Html</button>
             </layout>
         </flow>
         <flow v-else-if="ntab === 'method'" class="inner" direction="v">

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

@@ -34,9 +34,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const clickgo = __importStar(require("clickgo"));
 class default_1 extends clickgo.form.AbstractForm {
-    get() {
+    get(isByterun = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            const f = yield clickgo.fs.getContent('/clickgo/theme/familiar.cgt');
+            const f = yield clickgo.fs.getContent('/clickgo/theme/' + (isByterun ? 'byterun.cgt' : 'familiar.cgt'));
             if (!f) {
                 return null;
             }
@@ -73,14 +73,14 @@ class default_1 extends clickgo.form.AbstractForm {
     clear() {
         clickgo.theme.clear().catch((e) => { throw e; });
     }
-    setGlobal() {
+    setGlobal(isByterun = false) {
         return __awaiter(this, void 0, void 0, function* () {
             const n = clickgo.form.notify({
                 'title': 'Info',
                 'content': 'Theme loading...',
                 'type': 'info'
             });
-            const t = yield this.get();
+            const t = yield this.get(isByterun);
             if (!t) {
                 clickgo.form.hideNotify(n);
                 return;

package/dist/app/demo/form/method/theme/theme.xml

@@ -3,7 +3,8 @@
         <button @click="load" style="height: 30px;">Load "/clickgo/theme/familiar.cgt"</button>
         <button @click="remove" style="height: 30px;">remove('familiar')</button>
         <button @click="clear" style="height: 30px;">clear()</button>
-        <button @click="setGlobal" style="height: 30px;">setGlobal "/clickgo/theme/familiar.cgt"</button>
+        <button @click="setGlobal(false)" style="height: 30px;">setGlobal "/clickgo/theme/familiar.cgt"</button>
+        <button @click="setGlobal(true)" style="height: 30px;">setGlobal "/clickgo/theme/byterun.cgt"</button>
         <button @click="clearGlobal" style="height: 30px;">clearGlobal()</button>
     </layout>
 </form>

package/dist/index.js

@@ -95,7 +95,7 @@ function launcher(boot) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const paths = [
-                loader.cdn + '/npm/vue@3.2.41/dist/vue.global.prod.min.js'
+                loader.cdn + '/npm/vue@3.2.47/dist/vue.global.prod.min.js'
             ];
             let ro = true;
             if (!(window.ResizeObserver)) {
@@ -127,7 +127,7 @@ function launcher(boot) {
                 'map': map
             })[0];
             try {
-                const style = yield (yield fetch(__dirname + '/global.css')).text();
+                const style = yield (yield fetch(__dirname + '/global.css' + (__dirname.startsWith(loader.cdn) ? '' : '?' + Math.random().toString()))).text();
                 (_a = document.getElementById('cg-global')) === null || _a === void 0 ? void 0 : _a.insertAdjacentHTML('afterbegin', style);
             }
             catch (_b) {

package/dist/index.ts

@@ -161,7 +161,7 @@ export function launcher(boot: AbstractBoot): void {
     (async function() {
         // --- 通过标签加载库 ---
         const paths: string[] = [
-            loader.cdn + '/npm/vue@3.2.41/dist/vue.global.prod.min.js'
+            loader.cdn + '/npm/vue@3.2.47/dist/vue.global.prod.min.js'
         ];
         // --- 判断 ResizeObserver 是否存在 ---
         let ro = true;
@@ -200,7 +200,7 @@ export function launcher(boot: AbstractBoot): void {
         })[0] as typeof import('../dist/clickgo');
         // --- 加载 clickgo 的 global css ---
         try {
-            const style = await (await fetch(__dirname + '/global.css')).text();
+            const style = await (await fetch(__dirname + '/global.css' + (__dirname.startsWith(loader.cdn) ? '' : '?' + Math.random().toString()))).text();
             document.getElementById('cg-global')?.insertAdjacentHTML('afterbegin', style);
         }
         catch {

package/dist/lib/fs.js

@@ -38,7 +38,7 @@ const task = __importStar(require("./task"));
 const form = __importStar(require("./form"));
 const core = __importStar(require("./core"));
 const native = __importStar(require("./native"));
-const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/config.json', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/box/', '/app/demo/form/control/box/box.js', '/app/demo/form/control/box/box.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/flow/', '/app/demo/form/control/flow/flow.css', '/app/demo/form/control/flow/flow.js', '/app/demo/form/control/flow/flow.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/layout/', '/app/demo/form/control/layout/layout.js', '/app/demo/form/control/layout/layout.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/nav/', '/app/demo/form/control/nav/nav.js', '/app/demo/form/control/nav/nav.xml', '/app/demo/form/control/panel/', '/app/demo/form/control/panel/panel.js', '/app/demo/form/control/panel/panel.xml', '/app/demo/form/control/panel/test1.js', '/app/demo/form/control/panel/test1.xml', '/app/demo/form/control/panel/test2.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/table/', '/app/demo/form/control/table/table.js', '/app/demo/form/control/table/table.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/vflow/', '/app/demo/form/control/vflow/vflow.css', '/app/demo/form/control/vflow/vflow.js', '/app/demo/form/control/vflow/vflow.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/other/', '/app/demo/form/event/other/other.js', '/app/demo/form/event/other/other.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/sd.js', '/app/demo/form/method/aform/sd.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/native/', '/app/demo/form/method/native/native.js', '/app/demo/form/method/native/native.xml', '/app/demo/form/method/system/', '/app/demo/form/method/system/system.js', '/app/demo/form/method/system/system.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/config.json', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/box.cgc', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/nav.cgc', '/control/property.cgc', '/control/table.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
+const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/config.json', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/box/', '/app/demo/form/control/box/box.js', '/app/demo/form/control/box/box.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/desc/', '/app/demo/form/control/desc/desc.js', '/app/demo/form/control/desc/desc.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/flow/', '/app/demo/form/control/flow/flow.css', '/app/demo/form/control/flow/flow.js', '/app/demo/form/control/flow/flow.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/html/', '/app/demo/form/control/html/html.js', '/app/demo/form/control/html/html.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/layout/', '/app/demo/form/control/layout/layout.js', '/app/demo/form/control/layout/layout.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/nav/', '/app/demo/form/control/nav/nav.js', '/app/demo/form/control/nav/nav.xml', '/app/demo/form/control/panel/', '/app/demo/form/control/panel/panel.js', '/app/demo/form/control/panel/panel.xml', '/app/demo/form/control/panel/test1.js', '/app/demo/form/control/panel/test1.xml', '/app/demo/form/control/panel/test2.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/table/', '/app/demo/form/control/table/table.js', '/app/demo/form/control/table/table.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/vflow/', '/app/demo/form/control/vflow/vflow.css', '/app/demo/form/control/vflow/vflow.js', '/app/demo/form/control/vflow/vflow.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/other/', '/app/demo/form/event/other/other.js', '/app/demo/form/event/other/other.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/sd.js', '/app/demo/form/method/aform/sd.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/native/', '/app/demo/form/method/native/native.js', '/app/demo/form/method/native/native.xml', '/app/demo/form/method/system/', '/app/demo/form/method/system/system.js', '/app/demo/form/method/system/system.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/config.json', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/compcga.js', '/compcga.ts', '/control/', '/control/box.cgc', '/control/common.cgc', '/control/desc.cgc', '/control/form.cgc', '/control/html.cgc', '/control/monaco.cgc', '/control/nav.cgc', '/control/property.cgc', '/control/table.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/byterun.cgt', '/theme/familiar.cgt'];
 const localeData = {
     'en': {
         'apply-unmount': 'Are you sure to unmount the "?" mount point?',

package/dist/lib/fs.ts

@@ -12,7 +12,7 @@ import * as form from './form';
 import * as core from './core';
 import * as native from './native';
 
-const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/config.json', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/box/', '/app/demo/form/control/box/box.js', '/app/demo/form/control/box/box.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/flow/', '/app/demo/form/control/flow/flow.css', '/app/demo/form/control/flow/flow.js', '/app/demo/form/control/flow/flow.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/layout/', '/app/demo/form/control/layout/layout.js', '/app/demo/form/control/layout/layout.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/nav/', '/app/demo/form/control/nav/nav.js', '/app/demo/form/control/nav/nav.xml', '/app/demo/form/control/panel/', '/app/demo/form/control/panel/panel.js', '/app/demo/form/control/panel/panel.xml', '/app/demo/form/control/panel/test1.js', '/app/demo/form/control/panel/test1.xml', '/app/demo/form/control/panel/test2.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/table/', '/app/demo/form/control/table/table.js', '/app/demo/form/control/table/table.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/vflow/', '/app/demo/form/control/vflow/vflow.css', '/app/demo/form/control/vflow/vflow.js', '/app/demo/form/control/vflow/vflow.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/other/', '/app/demo/form/event/other/other.js', '/app/demo/form/event/other/other.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/sd.js', '/app/demo/form/method/aform/sd.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/native/', '/app/demo/form/method/native/native.js', '/app/demo/form/method/native/native.xml', '/app/demo/form/method/system/', '/app/demo/form/method/system/system.js', '/app/demo/form/method/system/system.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/config.json', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/control/', '/control/box.cgc', '/control/common.cgc', '/control/form.cgc', '/control/monaco.cgc', '/control/nav.cgc', '/control/property.cgc', '/control/table.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/familiar.cgt'];
+const clickgoFiles = ['/app/', '/app/demo/', '/app/demo/app.js', '/app/demo/config.json', '/app/demo/form/', '/app/demo/form/control/', '/app/demo/form/control/block/', '/app/demo/form/control/block/block.css', '/app/demo/form/control/block/block.xml', '/app/demo/form/control/box/', '/app/demo/form/control/box/box.js', '/app/demo/form/control/box/box.xml', '/app/demo/form/control/button/', '/app/demo/form/control/button/button.css', '/app/demo/form/control/button/button.js', '/app/demo/form/control/button/button.xml', '/app/demo/form/control/check/', '/app/demo/form/control/check/check.js', '/app/demo/form/control/check/check.xml', '/app/demo/form/control/desc/', '/app/demo/form/control/desc/desc.js', '/app/demo/form/control/desc/desc.xml', '/app/demo/form/control/dialog/', '/app/demo/form/control/dialog/dialog.js', '/app/demo/form/control/dialog/dialog.xml', '/app/demo/form/control/file/', '/app/demo/form/control/file/file.js', '/app/demo/form/control/file/file.xml', '/app/demo/form/control/flow/', '/app/demo/form/control/flow/flow.css', '/app/demo/form/control/flow/flow.js', '/app/demo/form/control/flow/flow.xml', '/app/demo/form/control/form/', '/app/demo/form/control/form/form.css', '/app/demo/form/control/form/form.js', '/app/demo/form/control/form/form.xml', '/app/demo/form/control/html/', '/app/demo/form/control/html/html.js', '/app/demo/form/control/html/html.xml', '/app/demo/form/control/img/', '/app/demo/form/control/img/img.xml', '/app/demo/form/control/label/', '/app/demo/form/control/label/label.xml', '/app/demo/form/control/layout/', '/app/demo/form/control/layout/layout.js', '/app/demo/form/control/layout/layout.xml', '/app/demo/form/control/list/', '/app/demo/form/control/list/list.css', '/app/demo/form/control/list/list.js', '/app/demo/form/control/list/list.xml', '/app/demo/form/control/loading/', '/app/demo/form/control/loading/loading.xml', '/app/demo/form/control/marquee/', '/app/demo/form/control/marquee/marquee.js', '/app/demo/form/control/marquee/marquee.xml', '/app/demo/form/control/menu/', '/app/demo/form/control/menu/menu.js', '/app/demo/form/control/menu/menu.xml', '/app/demo/form/control/monaco/', '/app/demo/form/control/monaco/monaco.js', '/app/demo/form/control/monaco/monaco.xml', '/app/demo/form/control/nav/', '/app/demo/form/control/nav/nav.js', '/app/demo/form/control/nav/nav.xml', '/app/demo/form/control/panel/', '/app/demo/form/control/panel/panel.js', '/app/demo/form/control/panel/panel.xml', '/app/demo/form/control/panel/test1.js', '/app/demo/form/control/panel/test1.xml', '/app/demo/form/control/panel/test2.xml', '/app/demo/form/control/property/', '/app/demo/form/control/property/property.js', '/app/demo/form/control/property/property.xml', '/app/demo/form/control/radio/', '/app/demo/form/control/radio/radio.js', '/app/demo/form/control/radio/radio.xml', '/app/demo/form/control/scroll/', '/app/demo/form/control/scroll/scroll.js', '/app/demo/form/control/scroll/scroll.xml', '/app/demo/form/control/select/', '/app/demo/form/control/select/select.js', '/app/demo/form/control/select/select.xml', '/app/demo/form/control/tab/', '/app/demo/form/control/tab/tab.js', '/app/demo/form/control/tab/tab.xml', '/app/demo/form/control/table/', '/app/demo/form/control/table/table.js', '/app/demo/form/control/table/table.xml', '/app/demo/form/control/text/', '/app/demo/form/control/text/text.js', '/app/demo/form/control/text/text.xml', '/app/demo/form/control/vflow/', '/app/demo/form/control/vflow/vflow.css', '/app/demo/form/control/vflow/vflow.js', '/app/demo/form/control/vflow/vflow.xml', '/app/demo/form/event/', '/app/demo/form/event/form/', '/app/demo/form/event/form/form.css', '/app/demo/form/event/form/form.js', '/app/demo/form/event/form/form.xml', '/app/demo/form/event/other/', '/app/demo/form/event/other/other.js', '/app/demo/form/event/other/other.xml', '/app/demo/form/event/screen/', '/app/demo/form/event/screen/screen.js', '/app/demo/form/event/screen/screen.xml', '/app/demo/form/event/task/', '/app/demo/form/event/task/task.js', '/app/demo/form/event/task/task.xml', '/app/demo/form/main.css', '/app/demo/form/main.js', '/app/demo/form/main.xml', '/app/demo/form/method/', '/app/demo/form/method/aform/', '/app/demo/form/method/aform/aform.js', '/app/demo/form/method/aform/aform.xml', '/app/demo/form/method/aform/sd.js', '/app/demo/form/method/aform/sd.xml', '/app/demo/form/method/core/', '/app/demo/form/method/core/core.js', '/app/demo/form/method/core/core.xml', '/app/demo/form/method/dom/', '/app/demo/form/method/dom/dom.css', '/app/demo/form/method/dom/dom.js', '/app/demo/form/method/dom/dom.xml', '/app/demo/form/method/form/', '/app/demo/form/method/form/form.css', '/app/demo/form/method/form/form.js', '/app/demo/form/method/form/form.xml', '/app/demo/form/method/form/test.xml', '/app/demo/form/method/fs/', '/app/demo/form/method/fs/fs.js', '/app/demo/form/method/fs/fs.xml', '/app/demo/form/method/fs/text.js', '/app/demo/form/method/fs/text.xml', '/app/demo/form/method/native/', '/app/demo/form/method/native/native.js', '/app/demo/form/method/native/native.xml', '/app/demo/form/method/system/', '/app/demo/form/method/system/system.js', '/app/demo/form/method/system/system.xml', '/app/demo/form/method/task/', '/app/demo/form/method/task/locale1.json', '/app/demo/form/method/task/locale2.json', '/app/demo/form/method/task/task.js', '/app/demo/form/method/task/task.xml', '/app/demo/form/method/theme/', '/app/demo/form/method/theme/theme.js', '/app/demo/form/method/theme/theme.xml', '/app/demo/form/method/tool/', '/app/demo/form/method/tool/tool.js', '/app/demo/form/method/tool/tool.xml', '/app/demo/form/method/zip/', '/app/demo/form/method/zip/zip.js', '/app/demo/form/method/zip/zip.xml', '/app/demo/global.css', '/app/demo/res/', '/app/demo/res/icon.svg', '/app/demo/res/img.jpg', '/app/demo/res/r-1.svg', '/app/demo/res/r-2.svg', '/app/demo/res/sql.svg', '/app/demo/res/txt.svg', '/app/demo/res/zip.svg', '/app/task/', '/app/task/app.js', '/app/task/config.json', '/app/task/form/', '/app/task/form/bar/', '/app/task/form/bar/bar.js', '/app/task/form/bar/bar.xml', '/app/task/form/desktop/', '/app/task/form/desktop/desktop.xml', '/app/task/locale/', '/app/task/locale/en.json', '/app/task/locale/ja.json', '/app/task/locale/sc.json', '/app/task/locale/tc.json', '/clickgo.js', '/clickgo.ts', '/compcga.js', '/compcga.ts', '/control/', '/control/box.cgc', '/control/common.cgc', '/control/desc.cgc', '/control/form.cgc', '/control/html.cgc', '/control/monaco.cgc', '/control/nav.cgc', '/control/property.cgc', '/control/table.cgc', '/control/task.cgc', '/global.css', '/icon.png', '/index.js', '/index.ts', '/lib/', '/lib/control.js', '/lib/control.ts', '/lib/core.js', '/lib/core.ts', '/lib/dom.js', '/lib/dom.ts', '/lib/form.js', '/lib/form.ts', '/lib/fs.js', '/lib/fs.ts', '/lib/native.js', '/lib/native.ts', '/lib/task.js', '/lib/task.ts', '/lib/theme.js', '/lib/theme.ts', '/lib/tool.js', '/lib/tool.ts', '/lib/zip.js', '/lib/zip.ts', '/theme/', '/theme/byterun.cgt', '/theme/familiar.cgt'];
 
 /** --- fs lib 用到的语言包 --- */
 const localeData: Record<string, {

package/dist/lib/task.js

@@ -898,6 +898,18 @@ function run(url, opt = {}, ntid) {
                 purify: function (text) {
                     return tool.purify(text);
                 },
+                match: function (str, regs) {
+                    return tool.match(str, regs);
+                },
+                layoutAddTagClassAndReTagName: function (layout, retagname) {
+                    return tool.layoutAddTagClassAndReTagName(layout, retagname);
+                },
+                layoutClassPrepend: function (layout, preps) {
+                    return tool.layoutClassPrepend(layout, preps);
+                },
+                stylePrepend: function (style, prep = '') {
+                    return tool.stylePrepend(style, prep);
+                },
                 rand: function (min, max) {
                     return tool.rand(min, max);
                 },

package/dist/lib/task.ts

@@ -1001,6 +1001,18 @@ export async function run(url: string | types.IApp, opt: types.ITaskRunOptions =
             purify: function(text: string): string {
                 return tool.purify(text);
             },
+            match: function(str: string, regs: RegExp[]): boolean {
+                return tool.match(str, regs);
+            },
+            layoutAddTagClassAndReTagName: function(layout: string, retagname: boolean): string {
+                return tool.layoutAddTagClassAndReTagName(layout, retagname);
+            },
+            layoutClassPrepend: function(layout: string, preps: string[]): string {
+                return tool.layoutClassPrepend(layout, preps);
+            },
+            stylePrepend: function(style: string, prep: string = ''): { 'style': string; 'prep': string; } {
+                return tool.stylePrepend(style, prep);
+            },
             rand: function(min: number, max: number): number {
                 return tool.rand(min, max);
             },

package/dist/lib/theme.js

@@ -50,21 +50,24 @@ function read(blob) {
         }
         const config = JSON.parse(configContent);
         const files = {};
-        for (const file of config.files) {
-            const mime = tool.getMimeByPath(file);
+        const list = z.readDir('/', {
+            'hasChildren': true
+        });
+        for (const file of list) {
+            const mime = tool.getMimeByPath(file.name);
             if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
-                const fab = yield z.getContent(file, 'string');
+                const fab = yield z.getContent(file.path + file.name, 'string');
                 if (!fab) {
                     continue;
                 }
-                files[file] = fab.replace(/^\ufeff/, '');
+                files[file.path + file.name] = fab.replace(/^\ufeff/, '');
             }
             else {
-                const fab = yield z.getContent(file, 'arraybuffer');
+                const fab = yield z.getContent(file.path + file.name, 'arraybuffer');
                 if (!fab) {
                     continue;
                 }
-                files[file] = new Blob([fab], {
+                files[file.path + file.name] = new Blob([fab], {
                     'type': mime.mime
                 });
             }
@@ -102,8 +105,8 @@ function load(theme, taskId) {
         }
         style = tool.stylePrepend(style, `cg-theme-task${taskId}-`).style;
         style = yield tool.styleUrl2DataUrl(theme.config.style, style, theme.files);
-        style = style.replace(/\[CGTMP-GLOBAL\] +::selection/g, `#cg-form-list > [data-task-id="${taskId}"] ::selection, #cg-pop-list > [class^="cg-theme-task${taskId}-"] ::selection`);
-        style = style.replace(/\[CGTMP-GLOBAL\]/g, `#cg-form-list > [data-task-id="${taskId}"], #cg-pop-list > [class^="cg-theme-task${taskId}-"]`);
+        style = style.replace(/\[CGTMP-GLOBAL\] +::selection/g, `#cg-form-list > [data-task-id="${taskId}"] ::selection, #cg-pop-list > [data-task-id="${taskId}"] ::selection`);
+        style = style.replace(/\[CGTMP-GLOBAL\]/g, `#cg-form-list > [data-task-id="${taskId}"], #cg-pop-list > [data-task-id="${taskId}"]`);
         if (!t.customTheme) {
             if (!isGlobal) {
                 t.customTheme = true;

package/dist/lib/theme.ts

@@ -36,23 +36,26 @@ export async function read(blob: Blob): Promise<types.ITheme | false> {
         return false;
     }
     const config: types.IThemeConfig = JSON.parse(configContent);
-    // --- 开始读取文件 ---
     const files: Record<string, Blob | string> = {};
-    for (const file of config.files) {
-        const mime = tool.getMimeByPath(file);
+    // --- 读取包文件 ---
+    const list = z.readDir('/', {
+        'hasChildren': true
+    });
+    for (const file of list) {
+        const mime = tool.getMimeByPath(file.name);
         if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
-            const fab = await z.getContent(file, 'string');
+            const fab = await z.getContent(file.path + file.name, 'string');
             if (!fab) {
                 continue;
             }
-            files[file] = fab.replace(/^\ufeff/, '');
+            files[file.path + file.name] = fab.replace(/^\ufeff/, '');
         }
         else {
-            const fab = await z.getContent(file, 'arraybuffer');
+            const fab = await z.getContent(file.path + file.name, 'arraybuffer');
             if (!fab) {
                 continue;
             }
-            files[file] = new Blob([fab], {
+            files[file.path + file.name] = new Blob([fab], {
                 'type': mime.mime
             });
         }
@@ -100,8 +103,8 @@ export async function load(theme?: types.ITheme, taskId?: number): Promise<boole
     style = tool.stylePrepend(style, `cg-theme-task${taskId}-`).style;
     style = await tool.styleUrl2DataUrl(theme.config.style, style, theme.files);
     // --- 替换 [CGTMP-GLOBAL] ---
-    style = style.replace(/\[CGTMP-GLOBAL\] +::selection/g, `#cg-form-list > [data-task-id="${taskId}"] ::selection, #cg-pop-list > [class^="cg-theme-task${taskId}-"] ::selection`);
-    style = style.replace(/\[CGTMP-GLOBAL\]/g, `#cg-form-list > [data-task-id="${taskId}"], #cg-pop-list > [class^="cg-theme-task${taskId}-"]`);
+    style = style.replace(/\[CGTMP-GLOBAL\] +::selection/g, `#cg-form-list > [data-task-id="${taskId}"] ::selection, #cg-pop-list > [data-task-id="${taskId}"] ::selection`);
+    style = style.replace(/\[CGTMP-GLOBAL\]/g, `#cg-form-list > [data-task-id="${taskId}"], #cg-pop-list > [data-task-id="${taskId}"]`);
     if (!t.customTheme) {
         // --- 如果当前 task 不是自定主题 ---
         if (!isGlobal) {

package/dist/lib/tool.js

@@ -254,7 +254,7 @@ function layoutClassPrepend(layout, preps) {
                 resultList.push(prep + item);
             }
         }
-        return ` class='${resultList.join(' ')}'`;
+        return ` class="${resultList.join(' ')}"`;
     }).replace(/ :class=(["']).+?>/gi, function (t, sp) {
         return t.replace(new RegExp(` :class=${sp}(.+?)${sp}`, 'gi'), function (t, t1) {
             t1 = t1.trim();
@@ -277,7 +277,7 @@ function layoutClassPrepend(layout, preps) {
             }
             return ` :class="${t1}"`;
         });
-    });
+    }).replace(/ id=(["'])/gi, ' id=$1' + preps[0]);
 }
 exports.layoutClassPrepend = layoutClassPrepend;
 function eventsAttrWrap(layout) {

package/dist/lib/tool.ts

@@ -325,7 +325,7 @@ function layoutClassPrependObject(object: string): string {
     }) + '}';
 }
 /**
- * --- 给 class 增加 scope 的随机前缀 ---
+ * --- 给 class 增加 scope 的随机前缀，给 id 新增前缀 ---
  * @param layout layout
  * @param preps 前置标识符列表，特殊字符串 scope 会被替换为随机前缀
  */
@@ -340,7 +340,7 @@ export function layoutClassPrepend(layout: string, preps: string[]): string {
                 resultList.push(prep + item);
             }
         }
-        return ` class='${resultList.join(' ')}'`;
+        return ` class="${resultList.join(' ')}"`;
     }).replace(/ :class=(["']).+?>/gi, function(t, sp) {
         return t.replace(new RegExp(` :class=${sp}(.+?)${sp}`, 'gi'), function(t, t1: string) {
             // --- t1 为 [] 或 {} ---
@@ -366,7 +366,7 @@ export function layoutClassPrepend(layout: string, preps: string[]): string {
             }
             return ` :class="${t1}"`;
         });
-    });
+    }).replace(/ id=(["'])/gi, ' id=$1' + preps[0]);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.1.14",
+  "version": "3.1.16-dev2",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -21,11 +21,9 @@
     "@litert/eslint-plugin-rules": "^0.1.2",
     "@litert/loader": "^3.4.9",
     "@types/node": "^18.11.14",
-    "electron": "^22.0.2",
+    "electron": "^22.2.0",
     "jszip": "^3.10.1",
+    "terser": "^5.16.3",
     "typescript": "^4.9.4"
-  },
-  "dependencies": {
-    "terser": "^5.16.1"
   }
 }